summaryrefslogtreecommitdiff
path: root/Documentation/revisions.txt
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2014-04-20 14:45:06 -0500
committerJunio C Hamano <gitster@pobox.com>2014-04-21 11:46:17 -0700
commitd04e0c79c6fe44dec6db66fdcbf5e4ba4e8bac92 (patch)
treece2ec5c27bef8f818d483f93d3ce78e647ad6fe2 /Documentation/revisions.txt
parent0794b01bf8d99b6ac9284cfb92f82ac0243c23a4 (diff)
downloadgit-fc/publish-vs-upstream.tar.gz
sha1_name: add support for @{publish} marksfc/publish-vs-upstream
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/revisions.txt')
-rw-r--r--Documentation/revisions.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 5a286d0d61..fd01cb4fcc 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -96,6 +96,10 @@ some output processing may assume ref names in UTF-8.
refers to the branch that the branch specified by branchname is set to build on
top of. A missing branchname defaults to the current one.
+'<branchname>@\{publish\}', e.g. 'master@\{publish\}', '@\{p\}'::
+ The suffix '@\{publish\}' to a branchname refers to the remote branch to
+ push to. A missing branchname defaults to the current one.
+
'<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.