dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-04 23:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge: cleanup messages like commit

Browse Source 
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>
This commit is contained in:
Denton Liu
2019-04-17 11:23:27 +01:00
committed by Junio C Hamano
parent ca04dc96d1
commit d540b70c85
7 changed files with 128 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/merge-options.txt
View File

@@ -32,6 +32,10 @@ they run `git merge`. To make it easier to adjust such scripts to the
updated behaviour, the environment variable `GIT_MERGE_AUTOEDIT` can be
set to `no` at the beginning of them.
--cleanup=<mode>::
This option determines how the merge message will be cleaned up
before commiting. See linkgit:git-commit[1] for more details.
--ff::
When the merge resolves as a fast-forward, only update the branch
pointer, without creating a merge commit. This is the default