From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Phillip Wood <phillip.wood123@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v3 1/4] merge-options.txt: correct typo
Date: Thu, 7 Mar 2019 01:58:27 -0800 [thread overview]
Message-ID: <1076d4c45108b1edad48fcac0f203c8c4e521b79.1551951770.git.liu.denton@gmail.com> (raw)
In-Reply-To: <cover.1551951770.git.liu.denton@gmail.com>
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@gmail.com>
---
Notes:
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
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -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[1] 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.
--ff::
When the merge resolves as a fast-forward, only update the branch
--
2.21.0.370.g4fdb13b891
next prev parent reply other threads:[~2019-03-07 9:58 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-06 10:30 [PATCH 0/2] cherry-pick/revert cleanup scissors fix Denton Liu
2019-03-06 10:30 ` [PATCH 1/2] t3507: cleanup space after redirection operators Denton Liu
2019-03-06 10:30 ` [PATCH 2/2] cherry-pick/revert: add scissors line on merge conflict Denton Liu
2019-03-06 16:29 ` Phillip Wood
2019-03-07 0:04 ` Denton Liu
2019-03-07 0:16 ` Denton Liu
2019-03-07 6:44 ` [PATCH v2 0/3] cherry-pick/revert cleanup scissors fix Denton Liu
2019-03-07 6:44 ` [PATCH v2 1/3] t3507: cleanup space after redirection operators Denton Liu
2019-03-07 7:34 ` Junio C Hamano
2019-03-07 6:44 ` [PATCH v2 2/3] cherry-pick/revert: add scissors line on merge conflict Denton Liu
2019-03-07 7:52 ` Junio C Hamano
2019-03-07 9:19 ` Denton Liu
2019-03-07 6:44 ` [PATCH v2 3/3] sequencer.c: don't die on invalid cleanup_arg Denton Liu
2019-03-07 8:01 ` Junio C Hamano
2019-03-07 9:58 ` [PATCH v3 0/4] cherry-pick/revert cleanup scissors fix Denton Liu
2019-03-07 9:58 ` Denton Liu [this message]
2019-03-08 3:40 ` [PATCH v3 1/4] merge-options.txt: correct typo Junio C Hamano
2019-03-07 9:58 ` [PATCH v3 2/4] t3507: cleanup space after redirection operators Denton Liu
2019-03-07 9:58 ` [PATCH v3 3/4] cherry-pick/revert: add scissors line on merge conflict Denton Liu
2019-03-07 15:24 ` Phillip Wood
2019-03-07 17:56 ` Denton Liu
2019-03-07 18:36 ` Phillip Wood
2019-03-08 0:09 ` Junio C Hamano
2019-03-07 9:58 ` [PATCH v3 4/4] sequencer.c: don't die on invalid cleanup_arg Denton Liu
2019-03-07 15:21 ` Phillip Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1076d4c45108b1edad48fcac0f203c8c4e521b79.1551951770.git.liu.denton@gmail.com \
--to=liu.denton@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood123@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).