diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-01 14:58:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-01 14:58:27 -0800 |
| commit | 8ef91f31f6606a0370b18943c3b0f089e04873f9 (patch) | |
| tree | 2bf27a3779a34fa4bf69dfc02e1fe1be848ea0d2 /merge-options.txt | |
| parent | 8ac8a3d8dd001611b77776fa19ef37c2c87cd987 (diff) | |
| download | git-htmldocs-8ef91f31f6606a0370b18943c3b0f089e04873f9.tar.gz | |
Autogenerated HTML docs for v2.24.0-308-g228f5
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-options.txt b/merge-options.txt index 59b8ff1e5..40dc4f5e8 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -34,7 +34,7 @@ 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 + committing. 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. |