| Message ID | 1076d4c45108b1edad48fcac0f203c8c4e521b79.1551951770.git.liu.denton@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | cherry-pick/revert cleanup scissors fix | expand |
Denton Liu <liu.denton@gmail.com> writes: > 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. The reason why you had to make this as an incremental on top of an older codebase (cf. Phillip's comment on 3/4) is because it is already in 'next' and we do not wholesale replace. I suspect that we merged it 'next' before it was ready---sorry about that. As the original series dl/merge-cleanup-scissors-fix is a short series that is only 4 patches long, let me kick it out of 'next' to make our lives easier. That way, you can send the squashed result as a fresh iteration, solving what these new 4 patches tries to as the proper part of the series, instead of making them as if they are afterthought on top of the original 4-patch series that was incomplete. Thanks.
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
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(-)