diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-08-17 02:11:03 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-18 14:02:05 -0700 |
| commit | 2a70fa4f1e377bc68bcabdc1a550e9970acccda7 (patch) | |
| tree | d1b19f888eaeba736f1fe2ad704a1294772a192f /Documentation/RelNotes-1.6.5.1.txt | |
| parent | merge script: --ff-only to disallow true merge (diff) | |
| download | tgif-2a70fa4f1e377bc68bcabdc1a550e9970acccda7.tar.xz | |
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>
Diffstat (limited to 'Documentation/RelNotes-1.6.5.1.txt')
0 files changed, 0 insertions, 0 deletions