path: root/sequencer.h
diff options
authorJunio C Hamano <>2019-05-08 15:37:24 (GMT)
committerJunio C Hamano <>2019-05-08 15:37:24 (GMT)
commitb877cb4a7ec2fafd03b6a3a70c26370744a32c1b (patch)
tree841a4389aea1aef57d9278bec5f966de5bb1ef7e /sequencer.h
parentf757794d9dbd1152c0a557d3a07617ac2fa5bc09 (diff)
parent1a2b985fb375e7ce14932bfc59365024af2fb6ab (diff)
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 'sequencer.h')
1 files changed, 8 insertions, 1 deletions
diff --git a/sequencer.h b/sequencer.h
index b69e768..75e292c 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -163,7 +163,14 @@ int todo_list_rearrange_squash(struct todo_list *todo_list);
void append_signoff(struct strbuf *msgbuf, size_t ignore_footer, unsigned flag);
-void append_conflicts_hint(struct index_state *istate, struct strbuf *msgbuf);
+void append_conflicts_hint(struct index_state *istate,
+ struct strbuf *msgbuf, enum commit_msg_cleanup_mode cleanup_mode);
+enum commit_msg_cleanup_mode get_cleanup_mode(const char *cleanup_arg,
+ int use_editor);
+void cleanup_message(struct strbuf *msgbuf,
+ enum commit_msg_cleanup_mode cleanup_mode, int verbose);
int message_is_empty(const struct strbuf *sb,
enum commit_msg_cleanup_mode cleanup_mode);
int template_untouched(const struct strbuf *sb, const char *template_file,