summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-23 00:08:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-23 00:08:13 (GMT)
commit4ca1b623865a9dc100f95a7867e35a9f73d7507a (patch)
treef9ad811bb2e2b5b612a4b756707c9d3483e97366 /Documentation
parentc6ec7efdd4c63f5c53184651cb05748e7bc71075 (diff)
parentae0ba8e20a2fb57299381ba2daa7c6d1863320d0 (diff)
downloadgit-4ca1b623865a9dc100f95a7867e35a9f73d7507a.zip
git-4ca1b623865a9dc100f95a7867e35a9f73d7507a.tar.gz
git-4ca1b623865a9dc100f95a7867e35a9f73d7507a.tar.bz2
Merge branch 'js/refer-upstream'
* js/refer-upstream: Teach @{upstream} syntax to strbuf_branchanme() t1506: more test for @{upstream} syntax Introduce <branch>@{upstream} notation
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-rev-parse.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index d375f1a..818eb48 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -234,6 +234,10 @@ 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 branch the ref is set to build on top of. Missing ref defaults
+ to the current branch.
+
* A suffix '{caret}' to a revision parameter means the first parent of
that commit object. '{caret}<n>' means the <n>th parent (i.e.
'rev{caret}'