diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-03-10 01:18:12 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-03-10 01:18:12 +0000 |
| commit | a8cc1d89becb271f194a70827ae548d577d57c1e (patch) | |
| tree | 7eabc4dac68221fec320185b92fa2e47e6e31ab1 /git-rev-parse.html | |
| parent | c5be4cc1f482f43e73d5d1289ca5e4ab3cc0b9fd (diff) | |
| download | git-htmldocs-a8cc1d89becb271f194a70827ae548d577d57c1e.tar.gz | |
Autogenerated HTML docs for v1.7.4.1-225-g83c3c
Diffstat (limited to 'git-rev-parse.html')
| -rw-r--r-- | git-rev-parse.html | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/git-rev-parse.html b/git-rev-parse.html index 89f918e91..260b4760a 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -788,7 +788,8 @@ A symbolic ref name. E.g. <em>master</em> typically means the commit <li>
<p>
if <tt>$GIT_DIR/<name></tt> exists, that is what you mean (this is usually
- useful only for <tt>HEAD</tt>, <tt>FETCH_HEAD</tt>, <tt>ORIG_HEAD</tt> and <tt>MERGE_HEAD</tt>);
+ useful only for <tt>HEAD</tt>, <tt>FETCH_HEAD</tt>, <tt>ORIG_HEAD</tt>, <tt>MERGE_HEAD</tt>
+ and <tt>CHERRY_PICK_HEAD</tt>);
</p>
</li>
<li>
@@ -823,7 +824,9 @@ way, to record the position of the HEAD before their operation, so that you can change the tip of the branch back to the state before you ran
them easily.
MERGE_HEAD records the commit(s) you are merging into your branch
-when you run <em>git merge</em>.</p></div>
+when you run <em>git merge</em>.
+CHERRY_PICK_HEAD records the commit you are cherry-picking
+when you run <em>git cherry-pick</em>.</p></div>
<div class="paragraph"><p>Note that any of the <tt>refs/*</tt> cases above may come either from
the <tt>$GIT_DIR/refs</tt> directory or from the <tt>$GIT_DIR/packed-refs</tt> file.</p></div>
</li>
|