From: Junio C Hamano <gitster@pobox•com>
To: Simon Eugster <simon.eu@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH 2/2] Documentation on git-checkout --ours/--theirs improved
Date: Wed, 17 Jun 2015 08:10:02 -0700 [thread overview]
Message-ID: <xmqqwpz24bhx.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAO8d5BYkgNgB+fV2HjrUasYi0jz9YvZGuFxKNMBbWoaONpAeUA@mail.gmail.com> (Simon Eugster's message of "Wed, 17 Jun 2015 16:31:45 +0200")
Simon Eugster <simon.eu@gmail•com> writes:
> A better picture would be nice.
> And regarding the textual description, are you going to commit your version?
Nah, I'd rather not take credit away from you ;-)
prev parent reply other threads:[~2015-06-17 15:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-11 11:39 [PATCH] Documentation clarification on git-checkout regarding ours/theirs Simon A. Eugster
2015-06-11 15:37 ` Junio C Hamano
2015-06-15 12:47 ` [PATCH] Documentation clarification on git-checkout Simon A. Eugster
2015-06-15 12:47 ` [PATCH 1/2] Documentation clarification on git-checkout regarding ours/theirs Simon A. Eugster
2015-06-15 12:47 ` [PATCH 2/2] Documentation on git-checkout --ours/--theirs improved Simon A. Eugster
2015-06-15 20:10 ` Junio C Hamano
2015-06-16 7:03 ` Simon Eugster
2015-06-16 15:41 ` Junio C Hamano
2015-06-17 14:31 ` Simon Eugster
2015-06-17 15:10 ` Junio C Hamano [this message]
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=xmqqwpz24bhx.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=simon.eu@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox