From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 12 Jul 2015 16:36:33 GMT
Subject: Re: [PATCH] Documentation clarification on git-checkout regarding ours/theirs
Message-ID: <xmqqd1zxjpta.fsf@gitster.dls.corp.google.com>
In-Reply-To: <55A0A8EF.4080701@gmail.com>

"Simon A. Eugster" <simon.eu@gmail.com> writes:

>> +...  As the keeper of
>> +the canonical history, you need to view the history from the remote
>> +as `ours` (i.e. "our shared canonical history"), while what you did
>> +on your side branch as `theirs` (i.e. "one contributor's work on top
>> +of it").
>>
>>   -b <new_branch>::
>>   	Create a new branch named <new_branch> and start it at
>
> I think there is an “s” missing in “… and treat the work done on
> the branch …”, but not quite sure.

Thanks, you are right.  Will fix.