diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-09 02:18:07 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-09 02:18:07 +0900 |
| commit | d1063b1b2e658ecbb78ae560ecb80d543e8c78c5 (patch) | |
| tree | 0866004a8e9aed3f3a78c77d85729a8845fbb81c /merge-options.txt | |
| parent | 2ba14716c3b8d8081480683846aefbc1d2abe0db (diff) | |
| download | git-htmldocs-d1063b1b2e658ecbb78ae560ecb80d543e8c78c5.tar.gz | |
Autogenerated HTML docs for v2.21.0-896-g6a6c0f
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/merge-options.txt b/merge-options.txt index 92a7d936c..61876dbc3 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -32,6 +32,13 @@ 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. In addition, if + the '<mode>' is given a value of `scissors`, scissors will be appended + to `MERGE_MSG` before being passed on to the commit machinery in the + case of a merge conflict. + --ff:: When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default |