diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-11-07 16:29:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-09 10:29:42 -0800 |
| commit | fab47d057559301c74d6642576694fd251a3fd11 (patch) | |
| tree | fc15537de16edab4ae239e86c509ad3fc05c716c /t/t6101-rev-parse-parents.sh | |
| parent | commit: copy merged signed tags to headers of merge commit (diff) | |
| download | tgif-fab47d057559301c74d6642576694fd251a3fd11.tar.xz | |
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>
Diffstat (limited to 't/t6101-rev-parse-parents.sh')
0 files changed, 0 insertions, 0 deletions