[PATCH v3 1/4] merge-options.txt: correct typo
- Date: Thu, 7 Mar 2019 01:58:27 -0800
- From: Denton Liu <liu.denton@xxxxxxxxx>
- Subject: [PATCH v3 1/4] merge-options.txt: correct typo
The scissors line is included after the human commit message. Therefore,
saying "scissors will be prepended" was incorrect. Update to say
"appended" which is more correct.
Signed-off-by: Denton Liu <liu.denton@xxxxxxxxx>
Note that this can be squashed into 6f06b6aeef (merge: add scissors line on
merge conflict, 2019-01-22) if it makes life easier.
Documentation/merge-options.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index c2a263ba74..6fff647409 100644
@@ -31,8 +31,8 @@ set to `no` at the beginning of them.
This option determines how the merge message will be cleaned up
before commiting or being passed on. See linkgit:git-commit for more
details. In addition, if the '<mode>' is given a value of `scissors`,
- scissors will be prepended to MERGE_MSG before being passed on in the case
- of a merge conflict.
+ scissors will be appended to MERGE_MSG before being passed on in the
+ case of a merge conflict.
When the merge resolves as a fast-forward, only update the branch