[PATCH] Documentation clarification on git-checkout regarding ours/theirs
From: Simon A. Eugster <hidden>
Date: 2016-06-15 23:05:16
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
From: "Simon A. Eugster" <redacted> Signed-off-by: Simon A. Eugster <redacted> --- 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