Merge branch 'js/refer-upstream'

diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index d375f1af1025698f73900d7eacdf8dc314a87278..818eb48d679a66fed046917f8211e3b490a80f31 100644 (file)
--- 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}'