summaryrefslogtreecommitdiff
path: root/branch.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-13 22:53:08 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-13 22:53:08 -0800
commitb2dd02112052aff875e8dc7d12b9915c91feafe2 (patch)
tree575640076625dbc13dd950e78f8c0ab5f23e2b06 /branch.h
parenta96a89f7153150c7e59d5481dd22773173b5a877 (diff)
parent39bd6f726109942c6f77f59638f6763c9f00706c (diff)
downloadgit-b2dd02112052aff875e8dc7d12b9915c91feafe2.tar.gz
Merge branch 'jn/branch-move-to-self'
* jn/branch-move-to-self: Allow checkout -B <current-branch> to update the current branch branch: allow a no-op "branch -M <current-branch> HEAD"
Diffstat (limited to 'branch.h')
-rw-r--r--branch.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/branch.h b/branch.h
index 1493f73722..b99c5a369e 100644
--- a/branch.h
+++ b/branch.h
@@ -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