From: "Simon A. Eugster" <simon.eu@gmail.com>
To: git@vger.kernel.org, gitster@pobox.com
Cc: "Simon A. Eugster" <simon.eugster@eps.ch>
Subject: [PATCH 1/2] Documentation clarification on git-checkout regarding ours/theirs
Date: Mon, 15 Jun 2015 14:47:26 +0200 [thread overview]
Message-ID: <1434372447-51230-2-git-send-email-simon.eu@gmail.com> (raw)
In-Reply-To: <1434372447-51230-1-git-send-email-simon.eu@gmail.com>
From: "Simon A. Eugster" <simon.eugster@eps.ch>
Signed-off-by: Simon A. Eugster <simon.eugster@eps.ch>
---
Documentation/git-checkout.txt | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index d263a56..5c3ef86 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -115,7 +115,11 @@ entries; instead, unmerged entries are ignored.
--ours::
--theirs::
When checking out paths from the index, check out stage #2
- ('ours') or #3 ('theirs') for unmerged paths.
+ ('ours', HEAD) or #3 ('theirs', MERGE_HEAD) for unmerged paths.
++
+After a `git pull --rebase`, for example, 'ours' points to the remote
+version and 'theirs' points to the local version. See linkgit:git-merge[1]
+for details about stages #2 and #3.
-b <new_branch>::
Create a new branch named <new_branch> and start it at
--
1.8.5.1
next prev parent 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 ` [PATCH] Documentation clarification on git-checkout Simon A. Eugster
2015-06-15 12:47 ` Simon A. Eugster [this message]
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-2-git-send-email-simon.eu@gmail.com \
--to=simon.eu@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 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).