Can't find for a long period of time how to add this option in TortoiseGit
What is the difference between `git merge` and `git merge --no-ff`?
Can anyone explain how do I set it?
Asked
Active
Viewed 1,356 times
2 Answers
8
See this attached image as the answer.
linquize
- 19,828
- 10
- 59
- 83
-
Can anyone tell how can it be saved to be default? – Notinlist Jan 23 '17 at 10:09
-
probably can not - https://stackoverflow.com/questions/44148254/how-can-i-set-merge-no-fast-forward-as-the-default-in-tortoisegit – Arioch 'The Jul 19 '21 at 12:08
1
It has nothing to do with TortoiseGit but rather with Git itself.
Go to the repository's directory in your shell and execute a command
git config --add --local merge.ff true
to force only fast-forward merges for that particular repository.
Note that TortoiseGit does not include any Git substitute, — instead, it piggybacks on Git for Windows installation, so if you have TortoiseGit installed you have Git for Windows installed as well.
kostix
- 51,517
- 14
- 93
- 176
-
To specify `--no-ff` you should put `false` at the end. [http://stackoverflow.com/a/6810687/2796922](http://stackoverflow.com/a/6810687/2796922) – elysch Apr 05 '16 at 13:59