git merge <tag> behavior · Yann Droneaud <hidden> · 2016-06-15
Re: git merge <tag> behavior · Max Nanasy <hidden> · 2016-06-15
Re: git merge <tag> behavior · Yann Droneaud <hidden> · 2016-06-15
[PATCH] t7600: test merge configuration override · Yann Droneaud <hidden> · 2016-06-15
[PATCH] t7600: merge tag shoud create a merge commit · <hidden> · 2016-06-15
[PATCH] t7600: merge tag shoud create a merge commit · <hidden> · 2016-08-14

Re: git merge <tag> behavior

From: Max Nanasy <hidden>
Date: 2016-06-15 22:56:28

Yann Droneaud <ydroneaud <at> opteya.com> writes:

3) Merge options can't be overridden.

If I modify .git/config to set a merge option, for example forcing
fast-forward merge, this option cannot be overridden on command line:

(git merge --no-ff-only --no-ff) should work.  The --no-ff-only overrides
the --ff-only configuration setting, and the --no-ff ensures that the merge
is not a fast-forward.

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help