Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
doc: revisions - name the left and right sides
author
Philip Oakley
<philipoakley@iee.org>
Wed, 20 Jul 2016 21:10:01 +0000
(22:10 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 20 Jul 2016 22:15:16 +0000
(15:15 -0700)
The terms left and right side originate from the symmetric
difference. Name them there.
Signed-off-by: Philip Oakley <philipoakley@iee.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/revisions.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
27ac837
)
diff --git
a/Documentation/revisions.txt
b/Documentation/revisions.txt
index d85e3033646faec23b23065cbd78436aca508acf..9fcad8a4400ca0be5c5d10909a7b01528efc4a3b 100644
(file)
--- a/
Documentation/revisions.txt
+++ b/
Documentation/revisions.txt
@@
-255,7
+255,7
@@
A similar notation 'r1\...r2' is called symmetric difference
of 'r1' and 'r2' and is defined as
'r1 r2 --not $(git merge-base --all r1 r2)'.
It is the set of commits that are reachable from either one of
-'r1'
or 'r2'
but not from both.
+'r1'
(left side) or 'r2' (right side)
but not from both.
In these two shorthands, you can omit one end and let it default to HEAD.
For example, 'origin..' is a shorthand for 'origin..HEAD' and asks "What