All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Simon A. Eugster" <simon.eu@gmail.com>
Cc: git@vger.kernel.org, "Simon A. Eugster" <simon.eugster@eps.ch>
Subject: Re: [PATCH] Documentation clarification on git-checkout regarding ours/theirs
Date: Sun, 12 Jul 2015 09:36:33 -0700	[thread overview]
Message-ID: <xmqqd1zxjpta.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <55A0A8EF.4080701@gmail.com> (Simon A. Eugster's message of "Sat, 11 Jul 2015 07:26:07 +0200")

"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.

  reply	other threads:[~2015-07-12 16:36 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-10  8:27 [PATCH] Documentation clarification on git-checkout regarding ours/theirs Simon A. Eugster
2015-07-10 20:07 ` Junio C Hamano
2015-07-11  5:26   ` Simon A. Eugster
2015-07-12 16:36     ` Junio C Hamano [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-06-11 11:39 Simon A. Eugster
2015-06-11 15:37 ` Junio C Hamano

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqd1zxjpta.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=simon.eu@gmail.com \
    --cc=simon.eugster@eps.ch \
    /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. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.