diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-02-10 23:26:48 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-02-10 23:26:48 +0000 |
| commit | e7c7be3d3137aa0f559466fc7ba937a890b1c1bb (patch) | |
| tree | ae586bcfb58e64866605fdea9143cec0d268e4a6 /git-rev-parse.txt | |
| parent | 78b92a83bd6ee958f83152774f567569c3a78e53 (diff) | |
| download | git-htmldocs-e7c7be3d3137aa0f559466fc7ba937a890b1c1bb.tar.gz | |
Autogenerated HTML docs for v1.7.0-rc2-28-gf476c0
Diffstat (limited to 'git-rev-parse.txt')
| -rw-r--r-- | git-rev-parse.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rev-parse.txt b/git-rev-parse.txt index fc731525d..d677c72d5 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt @@ -244,7 +244,7 @@ when you run 'git merge'. * The special construct '@\{-<n>\}' means the <n>th branch checked out before the current one. -* The suffix '@{upstream}' to a ref (short form 'ref@{u}') refers to +* The suffix '@\{upstream\}' to a ref (short form 'ref@\{u\}') refers to the branch the ref is set to build on top of. Missing ref defaults to the current branch. |