diff options
author | Carlos Martín Nieto <cmn@elego.de> | 2012-08-20 15:47:38 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-08-23 14:18:02 -0700 |
commit | 6183d826ba62ec94ccfcb8f6e3b8d43e3e338703 (patch) | |
tree | 6f951b43796c4d0a2b21a11b74132c81b4915c25 /git-mergetool--lib.sh | |
parent | Git 1.7.12 (diff) | |
download | tgif-6183d826ba62ec94ccfcb8f6e3b8d43e3e338703.tar.xz |
branch: introduce --set-upstream-to
The existing --set-uptream option can cause confusion, as it uses the
usual branch convention of assuming a starting point of HEAD if none
is specified, causing
git branch --set-upstream origin/master
to create a new local branch 'origin/master' that tracks the current
branch. As --set-upstream already exists, we can't simply change its
behaviour. To work around this, introduce --set-upstream-to which
accepts a compulsory argument indicating what the new upstream branch
should be and one optinal argument indicating which branch to change,
defaulting to HEAD.
The new options allows us to type
git branch --set-upstream-to origin/master
to set the current branch's upstream to be origin's master.
Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions