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 /branch.h | |
parent | branch: allow a no-op "branch -M <current-branch> HEAD" (diff) | |
download | tgif-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 'branch.h')
-rw-r--r-- | branch.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -13,7 +13,8 @@ * branch for (if any). */ void create_branch(const char *head, const char *name, const char *start_name, - int force, int reflog, enum branch_track track); + int force, int reflog, + int clobber_head, enum branch_track track); /* * Validates that the requested branch may be created, returning the |