Re: [PATCH 5/6] Documentation/git-merge.txt: improve short description in DESCRIPTION

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 5, 2016, 20:01 UTC
Message-ID: <xmqqr37uo99b.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <e03a84ad-9aa6-8ada-5828-7b28f76baaaf@gmail.com>

Jakub Narębski <jnareb@gmail.com> writes:

Show 7 quoted lines

>> +
>> +This command is used by 'git pull' to incorporate changes from another
>> +repository, and can be used by hand to merge changes from one branch
>> +into another.
>
> Rather "can be used by 'git pull'", or "is used by 'git pull' (unless
> configured otherwise)"...

I think you are misreading the original and the update (see my comments in the other message).

Show 17 quoted lines

>> @@ -31,11 +36,11 @@ Assume the following history exists and the current branch is
>>      D---E---F---G master
>>  ------------
>>  
>> -Then "`git merge topic`" will replay the changes made on the
>> -`topic` branch since it diverged from `master` (i.e., `E`) until
>> -its current commit (`C`) on top of `master`, and record the result
>> -in a new commit along with the names of the two parent commits and
>> -a log message from the user describing the changes.
>> +Then "`git merge topic`" will replay the changes made on the `topic`
>> +branch since it diverged from `master` (i.e., `E`) until its current
>> +commit (`C`) on top of `master`, and record the result in a new commit
>> +along with references to the two parent commits and a log message from
>> +the user describing the changes.
>
> What the happened here!?!  Please do not rewrap documentation, especially
> not without changes!

Yes, reflowing is bad but you can spot the change from "along with the names of the parent commits" to "along with references to the parent commits" if you stare at it long enough ;-)