diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-22 16:08:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-22 16:08:13 -0800 |
| commit | 4ca1b623865a9dc100f95a7867e35a9f73d7507a (patch) | |
| tree | f9ad811bb2e2b5b612a4b756707c9d3483e97366 /Documentation | |
| parent | Merge branch 'jl/submodule-diff' (diff) | |
| parent | Teach @{upstream} syntax to strbuf_branchanme() (diff) | |
| download | tgif-4ca1b623865a9dc100f95a7867e35a9f73d7507a.tar.xz | |
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.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index d375f1af10..818eb48d67 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}' |