| commit | fab47d057559301c74d6642576694fd251a3fd11 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 8 Nov 2011 00:29:34 +0000 (7 16:29 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 9 Nov 2011 18:29:42 +0000 (9 10:29 -0800) | ||
| tree | fc15537de16edab4ae239e86c509ad3fc05c716c | treesnapshot (tar.gz zip) |
| parent | 5231c633f2e54723d53a8cd928d9bc98b39dc35f | commitdiff |
merge: force edit and no-ff mode when merging a tag object
Now that we allow pulling a tag from the remote site to validate the
authenticity, we should give the user the final chance to verify and edit
the merge message. The integrator is expected to leave a meaningful merge
commit log in the history. Disallow fast-forwarding in such a case to
ensure that a merge commit is always recorded.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Now that we allow pulling a tag from the remote site to validate the
authenticity, we should give the user the final chance to verify and edit
the merge message. The integrator is expected to leave a meaningful merge
commit log in the history. Disallow fast-forwarding in such a case to
ensure that a merge commit is always recorded.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory |