diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2011-11-26 02:54:55 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-28 11:40:46 -0800 |
| commit | 39bd6f726109942c6f77f59638f6763c9f00706c (patch) | |
| tree | 903f5b34643ab93fa0a164a3962c70461b20406b /builtin/branch.c | |
| parent | 3f59481e338c2d3167b9654a4289a9d1201f7944 (diff) | |
| download | git-39bd6f726109942c6f77f59638f6763c9f00706c.tar.gz git-39bd6f726109942c6f77f59638f6763c9f00706c.tar.xz | |
Allow checkout -B <current-branch> to update the current branch
When on master, "git checkout -B master <commit>" is a more natural way to
say "git reset --keep <commit>", which was originally invented for the
exact purpose of moving to the named commit while keeping the local changes
around.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/branch.c')
| -rw-r--r-- | builtin/branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 24f33b241..823789fc9 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -737,7 +737,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) if (kinds != REF_LOCAL_BRANCH) die(_("-a and -r options to 'git branch' do not make sense with a branch name")); create_branch(head, argv[0], (argc == 2) ? argv[1] : head, - force_create, reflog, track); + force_create, reflog, 0, track); } else usage_with_options(builtin_branch_usage, options); |