search

mhutchie / vscode-git-graph

View a Git Graph of your repository in Visual Studio Code, and easily perform Git actions from the graph.
https://marketplace.visualstudio.com/items?itemName=mhutchie.git-graph
Other
1.97k stars 260 forks source link

Question about Extension Setting: git-graph.dialog.merge.noFastForward #799

Open LutzFassl opened 8 months ago

LutzFassl commented 8 months ago

When merging using Git Graph I want to avoid to do fast forward merges.

I am not sure how to do this. In the VS Code Menu I can only find the normal "Branch -> Merge Branch.." Action. When I do this, it always performs a FF merge, which I do not want.

Therefore I searched and found that there is this Extension setting from here https://github.com/mhutchie/vscode-git-graph/wiki/Extension-Settings: git-graph.dialog.merge.noFastForward But no matter how I configure it (true/false) it will just keep on doing the FF merge.

So therefore my solution / workaround was now to set this globally in the Git console: git config --global merge.ff false (works)

However I am still wondering if there was a more elegant way / Dialog in Git Graph that I could have used instead. Thanks for your response! Lutz