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 /revisions.txt | |
| parent | c5be4cc1f482f43e73d5d1289ca5e4ab3cc0b9fd (diff) | |
| download | git-htmldocs-a8cc1d89becb271f194a70827ae548d577d57c1e.tar.gz | |
Autogenerated HTML docs for v1.7.4.1-225-g83c3c
Diffstat (limited to 'revisions.txt')
| -rw-r--r-- | revisions.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/revisions.txt b/revisions.txt index 9e92734bc..04fceee25 100644 --- a/revisions.txt +++ b/revisions.txt @@ -25,7 +25,8 @@ blobs contained in a commit. first match in the following rules: . if `$GIT_DIR/<name>` exists, that is what you mean (this is usually - useful only for `HEAD`, `FETCH_HEAD`, `ORIG_HEAD` and `MERGE_HEAD`); + useful only for `HEAD`, `FETCH_HEAD`, `ORIG_HEAD`, `MERGE_HEAD` + and `CHERRY_PICK_HEAD`); . otherwise, `refs/<name>` if exists; @@ -46,6 +47,8 @@ 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 'git merge'. +CHERRY_PICK_HEAD records the commit you are cherry-picking +when you run 'git cherry-pick'. + Note that any of the `refs/*` cases above may come either from the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file. |