diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-22 16:08:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-22 16:08:05 -0800 |
| commit | 1a545d0b5fa56a7be88fe082cec7847715079a18 (patch) | |
| tree | 721ec8d309c6aea0fa3a80eea8d5c1ad07f6bed1 /builtin-branch.c | |
| parent | 67bc7407211d26de518811dafc2c1cf2e6124709 (diff) | |
| parent | 85e2233f982f760d0e731b1258da2580834d8027 (diff) | |
| download | git-1a545d0b5fa56a7be88fe082cec7847715079a18.tar.gz | |
Merge branch 'il/branch-set-upstream'
* il/branch-set-upstream:
branch: warn and refuse to set a branch as a tracking branch of itself.
Add branch --set-upstream
Diffstat (limited to 'builtin-branch.c')
| -rw-r--r-- | builtin-branch.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-branch.c b/builtin-branch.c index ddc9f2dab7..970cf31811 100644 --- a/builtin-branch.c +++ b/builtin-branch.c @@ -564,6 +564,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix) OPT__VERBOSE(&verbose), OPT_SET_INT('t', "track", &track, "set up tracking mode (see git-pull(1))", BRANCH_TRACK_EXPLICIT), + OPT_SET_INT( 0, "set-upstream", &track, "change upstream info", + BRANCH_TRACK_OVERRIDE), OPT_BOOLEAN( 0 , "color", &branch_use_color, "use colored output"), OPT_SET_INT('r', NULL, &kinds, "act on remote-tracking branches", REF_REMOTE_BRANCH), |