| commit | d550ecdc42bd9a5e364767da2177640724535e93 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 31 Aug 2012 20:24:38 +0000 (31 13:24 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 31 Aug 2012 20:24:39 +0000 (31 13:24 -0700) | ||
| tree | fa3ba1d1bb2163ec9848ffe830ec2e87ea9f1501 | treesnapshot (tar.gz zip) |
| parent | fc8eec460abd8306120f03344d625fad9492d2ee | commitdiff |
| parent | b347d06bf097aca5effd07871adf4d0c8a7c55bd | commitdiff |
Merge branch 'cn/branch-set-upstream-to' into next
"git branch --set-upstream origin/master" is a common mistake to
create a local branch 'origin/master' and set it to integrate with
the current branch. With a plan to deprecate this option, introduce
"git branch (-u|--set-upstream-to) origin/master" that sets the
current branch to integrate with 'origin/master' remote tracking
branch.
* cn/branch-set-upstream-to:
branch: deprecate --set-upstream and show help if we detect possible mistaken use
branch: add --unset-upstream option
branch: introduce --set-upstream-to
"git branch --set-upstream origin/master" is a common mistake to
create a local branch 'origin/master' and set it to integrate with
the current branch. With a plan to deprecate this option, introduce
"git branch (-u|--set-upstream-to) origin/master" that sets the
current branch to integrate with 'origin/master' remote tracking
branch.
* cn/branch-set-upstream-to:
branch: deprecate --set-upstream and show help if we detect possible mistaken use
branch: add --unset-upstream option
branch: introduce --set-upstream-to
| builtin/branch.c | diff1 | diff2 | blobhistory |
| t/t3200-branch.sh | diff1 | diff2 | blobhistory |