1

I am trying to set git merge --no-ff --no-commit as a default behaviour for merge.

Now I have read below questions:

How do I make git merge's default be --no-ff --no-commit?

Git: Default "no commit" merge behaviour for all branches?

Following those answers, I added below to global config:

[merge]
    tool = winmerge
    ff = false
    commit = false

After adding new configurations --no-ff works correctly, but it still automatically commits. Then I searched for tried merge-documentation page:

https://git-scm.com/docs/merge-config/2.18.0

There is merge.ff entry but not merge.commit. I'm currently using git version 2.29.2.windows.2.

I added --no-commit to local config mergeoptions for a workaround:

[branch "master"]
    mergeoptions = --no-commit

It works for now, but I would like to have that behaviour default for all projects and branches on my pc.

So my questions are below:

  1. Does merge.commit config really exist? If it is version problem, which version would allow this?
  2. If merge.commit is not available, what would be the alternative?
MarkSouls
  • 982
  • 4
  • 13

1 Answers1

1

There is no merge.commit option: see the source code, where you can see which options are handled, and observe the lack of a merge.commit option. There was no such option in 2014 either (clone and inspect the Git source to verify this, if you like).

The merge.ff option has been around since then, but merge.commit has, as far as I can tell, never existed. You can of course run a command other than git merge to start merging, and by doing that, you can make this command supply --no-commit as an explicit argument. Note, however, that you cannot alias Git built-ins, so there is no way to make a Git alias that inserts --no-commit when you run git merge. Run git mymerge and make that a Git alias, or run mymerge and make that a shell alias, but do not run git merge.

(Your other option is of course to set branch.name.mergeoptions for every branch name.)

torek
  • 448,244
  • 59
  • 642
  • 775
  • I really wonder where did they come up with merge.commit options... – MarkSouls Jan 07 '22 at 09:00
  • 1
    @MarkSouls: I'm not sure precisely how these come about, but since you can `git config` anything you like (`git config dutch.anteater aardvark`) and nothing *complains*, I can see how some people think it must mean something to do that. And, when someone is flailing, they might try several things at once, one of which is the one that actually *worked*, and get the impression that it was something else that worked. – torek Jan 07 '22 at 19:46
  • The one I really wonder about is `user.password`. Git itself does not and never has used this, but maybe *some* program *did*, the same way you can write your own program that checks for a `dutch.anteater` configuration variable. – torek Jan 07 '22 at 19:47
  • That makes sense, maybe there is a third party gui program that does checks ```merge.commit```. – MarkSouls Jan 10 '22 at 00:04