summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-05-21 04:45:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-22 16:33:08 (GMT)
commitadfe5d04345631299f9a4518d56c6dd3d47eb0b3 (patch)
tree45858e99c4038ea5e029ab917705b819885be081 /builtin
parent48c58471c2d4d7293272448a18801cd27555f6b5 (diff)
downloadgit-adfe5d04345631299f9a4518d56c6dd3d47eb0b3.zip
git-adfe5d04345631299f9a4518d56c6dd3d47eb0b3.tar.gz
git-adfe5d04345631299f9a4518d56c6dd3d47eb0b3.tar.bz2
sha1_name: implement @{push} shorthand
In a triangular workflow, each branch may have two distinct points of interest: the @{upstream} that you normally pull from, and the destination that you normally push to. There isn't a shorthand for the latter, but it's useful to have. For instance, you may want to know which commits you haven't pushed yet: git log @{push}.. Or as a more complicated example, imagine that you normally pull changes from origin/master (which you set as your @{upstream}), and push changes to your own personal fork (e.g., as myfork/topic). You may push to your fork from multiple machines, requiring you to integrate the changes from the push destination, rather than upstream. With this patch, you can just do: git rebase @{push} rather than typing out the full name. The heavy lifting is all done by branch_get_push; here we just wire it up to the "@{push}" syntax. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions