mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ks/branch-cleanup'

Browse Source 
Code clean-up.

* ks/branch-cleanup:
  builtin/branch: strip refs/heads/ using skip_prefix
  branch: update warning message shown when copying a misnamed branch
  branch: group related arguments of create_branch()
  branch: improve documentation and naming of create_branch() parameters
This commit is contained in:
Junio C Hamano
2017-12-27 11:16:25 -08:00
parent a13e45f1e7 255073ca59
commit 0faff988ee
4 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
branch.h
View File

@ -13,14 +13,20 @@
*
* - force enables overwriting an existing (non-head) branch
*
* - clobber_head_ok allows the currently checked out (hence existing)
* branch to be overwritten; without 'force', it has no effect.
*
* - reflog creates a reflog for the branch
*
* - quiet suppresses tracking information
*
* - track causes the new branch to be configured to merge the remote branch
* that start_name is a tracking branch for (if any).
*
*/
void create_branch(const char *name, const char *start_name,
int force, int reflog,
int clobber_head, int quiet, enum branch_track track);
int force, int clobber_head_ok,
int reflog, int quiet, enum branch_track track);
/*
* Check if 'name' can be a valid name for a branch; die otherwise.