summaryrefslogtreecommitdiffstats
path: root/git-rev-parse.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-10 16:28:17 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-10 16:28:17 -0700
commiteccdd4a4b39010678cef09a1c28c964396d2cc84 (patch)
tree2d65a5eb275d2fae69f4bfe3fd046907a0cf1037 /git-rev-parse.html
parentf335393cb267ed983d1b9d6574b95d6f26bd5a85 (diff)
downloadgit-htmldocs-eccdd4a4b39010678cef09a1c28c964396d2cc84.tar.gz
Autogenerated HTML docs for v1.7.12-315-g682c
Diffstat (limited to 'git-rev-parse.html')
-rw-r--r--git-rev-parse.html10
1 files changed, 9 insertions, 1 deletions
diff --git a/git-rev-parse.html b/git-rev-parse.html
index 411e2abd4..4bb17c7dc 100644
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -1029,7 +1029,9 @@ when you run <tt>git merge</tt>.
<em>CHERRY_PICK_HEAD</em> records the commit which you are cherry-picking
when you run <tt>git cherry-pick</tt>.</p></div>
<div class="paragraph"><p>Note that any of the <em>refs/*</em> cases above may come either from
-the <em>$GIT_DIR/refs</em> directory or from the <em>$GIT_DIR/packed-refs</em> file.</p></div>
+the <em>$GIT_DIR/refs</em> directory or from the <em>$GIT_DIR/packed-refs</em> file.
+While the ref name encoding is unspecified, UTF-8 is prefered as
+some output processing may assume ref names in UTF-8.</p></div>
</li>
</ol></div>
</dd>
@@ -1252,6 +1254,12 @@ of <em>r1</em> and <em>r2</em> and is defined as
<em>r1 r2 --not $(git merge-base --all r1 r2)</em>.
It is the set of commits that are reachable from either one of
<em>r1</em> or <em>r2</em> but not from both.</p></div>
+<div class="paragraph"><p>In these two shorthands, you can omit one end and let it default to HEAD.
+For example, <em>origin..</em> is a shorthand for <em>origin..HEAD</em> and asks "What
+did I do since I forked from the origin branch?" Similarly, <em>..origin</em>
+is a shorthand for <em>HEAD..origin</em> and asks "What did the origin do since
+I forked from them?" Note that <em>..</em> would mean <em>HEAD..HEAD</em> which is an
+empty range that is both reachable and unreachable from HEAD.</p></div>
<div class="paragraph"><p>Two other shorthands for naming a set that is formed by a commit
and its parent commits exist. The <em>r1&#94;@</em> notation means all
parents of <em>r1</em>. <em>r1&#94;!</em> includes commit <em>r1</em> but excludes