diff options
author | Denton Liu <liu.denton@gmail.com> | 2019-04-17 13:23:27 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-04-18 07:49:29 +0300 |
commit | d540b70c85ccd08507348785fd210ef8317a864d (patch) | |
tree | 8878e04d0d1ed6255dc880fe5753cbeee94b7699 /wt-status.h | |
parent | ca04dc96d13cbe5aead17a936e3b8695b20abb55 (diff) |
merge: cleanup messages like commit
This change allows git-merge messages to be cleaned up with the
commit.cleanup configuration or --cleanup option, just like how
git-commit does it.
We also give git-pull the option of --cleanup so that it can also take
advantage of this change.
Finally, add testing to ensure that messages are properly cleaned up.
Note that some newlines that were added to the commit message were
removed so that if a file were read via -F, it would be copied
faithfully.
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.h')
-rw-r--r-- | wt-status.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/wt-status.h b/wt-status.h index 3a95975032..64f1ddc9fd 100644 --- a/wt-status.h +++ b/wt-status.h @@ -129,6 +129,7 @@ struct wt_status { }; size_t wt_status_locate_end(const char *s, size_t len); +void wt_status_append_cut_line(struct strbuf *buf); void wt_status_add_cut_line(FILE *fp); void wt_status_prepare(struct repository *r, struct wt_status *s); void wt_status_print(struct wt_status *s); |