summaryrefslogtreecommitdiffstats
path: root/revisions.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-05 13:28:29 -0700
committerJunio C Hamano <gitster@pobox.com>2015-06-05 13:28:29 -0700
commit975f4dba2f3b9bdb50b16dbad38ac610850e9fc2 (patch)
tree7348cc49a6bd12e9fc61d76ed4f219ebfed85fe2 /revisions.txt
parent85f1fdef295d40098c723afbbbc650101868d697 (diff)
downloadgit-htmldocs-975f4dba2f3b9bdb50b16dbad38ac610850e9fc2.tar.gz
Autogenerated HTML docs for v2.4.3-368-g797488
Diffstat (limited to 'revisions.txt')
-rw-r--r--revisions.txt25
1 files changed, 25 insertions, 0 deletions
diff --git a/revisions.txt b/revisions.txt
index 07961185f..d85e30336 100644
--- a/revisions.txt
+++ b/revisions.txt
@@ -98,6 +98,31 @@ some output processing may assume ref names in UTF-8.
`branch.<name>.merge`). A missing branchname defaults to the
current one.
+'<branchname>@\{push\}', e.g. 'master@\{push\}', '@\{push\}'::
+ The suffix '@\{push}' reports the branch "where we would push to" if
+ `git push` were run while `branchname` was checked out (or the current
+ 'HEAD' if no branchname is specified). Since our push destination is
+ in a remote repository, of course, we report the local tracking branch
+ that corresponds to that branch (i.e., something in 'refs/remotes/').
++
+Here's an example to make it more clear:
++
+------------------------------
+$ git config push.default current
+$ git config remote.pushdefault myfork
+$ git checkout -b mybranch origin/master
+
+$ git rev-parse --symbolic-full-name @{upstream}
+refs/remotes/origin/master
+
+$ git rev-parse --symbolic-full-name @{push}
+refs/remotes/myfork/mybranch
+------------------------------
++
+Note in the example that we set up a triangular workflow, where we pull
+from one location and push to another. In a non-triangular workflow,
+'@\{push}' is the same as '@\{upstream}', and there is no need for it.
+
'<rev>{caret}', e.g. 'HEAD{caret}, v1.5.1{caret}0'::
A suffix '{caret}' to a revision parameter means the first parent of
that commit object. '{caret}<n>' means the <n>th parent (i.e.