diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-05-09 00:37:24 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-09 00:37:24 +0900 |
| commit | b877cb4a7ec2fafd03b6a3a70c26370744a32c1b (patch) | |
| tree | 841a4389aea1aef57d9278bec5f966de5bb1ef7e /builtin/tag.c | |
| parent | Merge branch 'pw/sequencer-cleanup-with-signoff-x-fix' (diff) | |
| parent | cherry-pick/revert: add scissors line on merge conflict (diff) | |
| download | tgif-b877cb4a7ec2fafd03b6a3a70c26370744a32c1b.tar.xz | |
Merge branch 'dl/merge-cleanup-scissors-fix'
The list of conflicted paths shown in the editor while concluding a
conflicted merge was shown above the scissors line when the
clean-up mode is set to "scissors", even though it was commented
out just like the list of updated paths and other information to
help the user explain the merge better.
* dl/merge-cleanup-scissors-fix:
cherry-pick/revert: add scissors line on merge conflict
sequencer.c: save and restore cleanup mode
merge: add scissors line on merge conflict
merge: cleanup messages like commit
parse-options.h: extract common --cleanup option
commit: extract cleanup_mode functions to sequencer
t7502: clean up style
t7604: clean up style
t3507: clean up style
t7600: clean up style
Diffstat (limited to 'builtin/tag.c')
| -rw-r--r-- | builtin/tag.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/tag.c b/builtin/tag.c index 8399a0ed54..1debd3a11c 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -408,8 +408,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix) OPT_FILENAME('F', "file", &msgfile, N_("read message from file")), OPT_BOOL('e', "edit", &edit_flag, N_("force edit of tag message")), OPT_BOOL('s', "sign", &opt.sign, N_("annotated and GPG-signed tag")), - OPT_STRING(0, "cleanup", &cleanup_arg, N_("mode"), - N_("how to strip spaces and #comments from message")), + OPT_CLEANUP(&cleanup_arg), OPT_STRING('u', "local-user", &keyid, N_("key-id"), N_("use another key to sign the tag")), OPT__FORCE(&force, N_("replace the tag if exists"), 0), |