From: Simon A. Eugster Date: Mon, 15 Jun 2015 12:47:26 GMT Subject: [PATCH 1/2] Documentation clarification on git-checkout regarding ours/theirs Message-ID: <1434372447-51230-2-git-send-email-simon.eu@gmail.com> In-Reply-To: <1434372447-51230-1-git-send-email-simon.eu@gmail.com> From: "Simon A. Eugster" Signed-off-by: Simon A. Eugster --- 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 :: Create a new branch named and start it at -- 1.8.5.1