diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-10 15:43:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-10 15:43:07 -0700 |
| commit | 83ce1764496d90a5ef45b0a109ab5fc222a62199 (patch) | |
| tree | f968fd2ac1c2004a21af138b998e637a63f7d101 /rerere.h | |
| parent | c2b927932d90588e7094100b470b9e94bd769afe (diff) | |
| parent | b347d06bf097aca5effd07871adf4d0c8a7c55bd (diff) | |
| download | git-83ce1764496d90a5ef45b0a109ab5fc222a62199.tar.gz git-83ce1764496d90a5ef45b0a109ab5fc222a62199.tar.xz | |
Merge branch 'cn/branch-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
Diffstat (limited to 'rerere.h')
0 files changed, 0 insertions, 0 deletions