diff options
author | Jeff King <peff@peff.net> | 2015-05-21 00:45:47 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-05-22 09:33:08 -0700 |
commit | adfe5d04345631299f9a4518d56c6dd3d47eb0b3 (patch) | |
tree | 45858e99c4038ea5e029ab917705b819885be081 /contrib/svn-fe/svnrdump_sim.py | |
parent | sha1_name: refactor interpret_upstream_mark (diff) | |
download | tgif-adfe5d04345631299f9a4518d56c6dd3d47eb0b3.tar.xz |
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 'contrib/svn-fe/svnrdump_sim.py')
0 files changed, 0 insertions, 0 deletions