| commit | 3adab6f3a7793253b22a4a7aae34221d19e0236a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 9 Feb 2012 21:30:52 +0000 (9 13:30 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 9 Feb 2012 21:30:52 +0000 (9 13:30 -0800) | ||
| tree | 63edce038f0aa2a5256edb8a23810f562443f5e8 | treesnapshot (tar.gz zip) |
| parent | b5c9f1c1b0ed9c91463b9f46a7c9dff3efc53773 | commitdiff |
merge: do not launch an editor on "--no-edit $tag"
When the user explicitly asked us not to, don't launch an editor.
But do everything else the same way as the "edit" case, i.e. leave the
comment with verification result in the log template and record the
mergesig in the resulting merge commit for later inspection.
Based on initiail analysis by Jonathan Nieder.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When the user explicitly asked us not to, don't launch an editor.
But do everything else the same way as the "edit" case, i.e. leave the
comment with verification result in the log template and record the
mergesig in the resulting merge commit for later inspection.
Based on initiail analysis by Jonathan Nieder.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory | |
| t/t7600-merge.sh | diffblobblamehistory |