diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-11-08 01:33:41 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-11-08 01:33:41 +0000 |
| commit | 0d3c81546c38713ca17817d884eed8f9ae6ae88b (patch) | |
| tree | 466e2d6598a9a923cde52bf7c55f9294adb26379 /git-rev-parse.html | |
| parent | d8c9d433c3925d52d9a78bab8de03ee3de469440 (diff) | |
| download | git-htmldocs-0d3c81546c38713ca17817d884eed8f9ae6ae88b.tar.gz | |
Autogenerated HTML docs for v1.4.4-rc1
Diffstat (limited to 'git-rev-parse.html')
| -rw-r--r-- | git-rev-parse.html | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/git-rev-parse.html b/git-rev-parse.html index 987ebc956..d452f1ee4 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -649,7 +649,11 @@ of <tt>r1</tt> and <tt>r2</tt> and is defined as "<tt>r1 r2 --not $(git-merge-base --all r1 r2)</tt>".
It it the set of commits that are reachable from either one of
<tt>r1</tt> or <tt>r2</tt> but not from both.</p>
-<p>Here are a few examples:</p>
+<p>Two other shorthands for naming a set that is formed by a commit
+and its parent commits exists. <tt>r1^@</tt> notation means all
+parents of <tt>r1</tt>. <tt>r1^!</tt> includes commit <tt>r1</tt> but excludes
+its all parents.</p>
+<p>Here are a handful examples:</p>
<div class="literalblock">
<div class="content">
<pre><tt>D A B D
@@ -657,7 +661,9 @@ D F A B C D F ^A G B D
^A F B C F
G...I C D F G I
-^B G I C D F G I</tt></pre>
+^B G I C D F G I
+F^@ A B C
+F^! H D F H</tt></pre>
</div></div>
</div>
<h2>Author</h2>
@@ -675,7 +681,7 @@ Junio C Hamano <junkio@cox.net></p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 26-Oct-2006 08:47:20 UTC
+Last updated 08-Nov-2006 01:33:31 UTC
</div>
</div>
</body>
|