git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Simon A. Eugster" <simon.eu@gmail.com>
To: git@vger.kernel.org, gitster@pobox.com
Subject: [PATCH] Documentation clarification on git-checkout
Date: Mon, 15 Jun 2015 14:47:25 +0200	[thread overview]
Message-ID: <1434372447-51230-1-git-send-email-simon.eu@gmail.com> (raw)
In-Reply-To: <xmqqwpzafe88.fsf@gitster.dls.corp.google.com>


I hope I managed to get this working with replying to your response, 
Junio, git send-email is all new to me.

Thanks a lot for your detailled answer. I tried to integrate it and 
hope it is understandable this way? 

Simon

  reply	other threads:[~2015-06-15 12:48 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   ` Simon A. Eugster [this message]
2015-06-15 12:47     ` [PATCH 1/2] " 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

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=1434372447-51230-1-git-send-email-simon.eu@gmail.com \
    --to=simon.eu@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).