From e2bbd0cc4c1b661cc04620a6704003793b190e7e Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Sat, 18 Nov 2017 22:56:46 +0530 Subject: branch: group related arguments of create_branch() 39bd6f726 (Allow checkout -B to update the current branch, 2011-11-26) added 'clobber_head' (now, 'clobber_head_ok') "before" 'track' as 'track' was closely related 'clobber_head' for the purpose the commit wanted to achieve. Looking from the perspective of how the arguments are used it turns out that 'clobber_head' is more related to 'force' than it is to 'track'. So, re-order the arguments to keep the related arguments close to each other. Signed-off-by: Kaartic Sivaraam Signed-off-by: Junio C Hamano --- branch.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'branch.h') diff --git a/branch.h b/branch.h index cb6411f840..f66536a10c 100644 --- a/branch.h +++ b/branch.h @@ -13,19 +13,20 @@ * * - force enables overwriting an existing (non-head) branch * - * - reflog creates a reflog for the 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_ok, int quiet, enum branch_track track); + int force, int clobber_head_ok, + int reflog, int quiet, enum branch_track track); /* * Validates that the requested branch may be created, returning the -- cgit v1.2.3