diff options
| author | Denton Liu <liu.denton@gmail.com> | 2019-04-17 11:23:27 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-18 13:49:29 +0900 |
| commit | d540b70c85ccd08507348785fd210ef8317a864d (patch) | |
| tree | 8878e04d0d1ed6255dc880fe5753cbeee94b7699 /Documentation/merge-options.txt | |
| parent | ca04dc96d13cbe5aead17a936e3b8695b20abb55 (diff) | |
| download | git-d540b70c85ccd08507348785fd210ef8317a864d.tar.gz | |
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 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 92a7d936c1..bcf0b3e49c 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -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 |