projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f07df52) | patch
merge script: handle --no-ff --no-commit correctly
authorJonathan Nieder <jrnieder@gmail.com>
Tue, 17 Aug 2010 07:11:03 +0000 (02:11 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 21:02:05 +0000 (14:02 -0700)
commit2a70fa4f1e377bc68bcabdc1a550e9970acccda7
treed1b19f888eaeba736f1fe2ad704a1294772a192ftree | snapshot
parentf07df52489c78c33c5c5c1bd973038283c401582commit | diff
merge script: handle --no-ff --no-commit correctly

In a --no-ff merge with conflicts, "git commit" used to forget the
--no-ff when used to complete the merge.  That was fixed by
v1.6.1-rc1~134^2 (builtin-commit: use reduce_heads() only when
appropriate, 2008-10-03) for the builtin merge.  Port the change to
the merge script in contrib/examples.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/examples/git-merge.sh diff | blob | history
Git—the stupid content tracker