summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-06-06 14:04:17 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-06-06 14:30:58 -0700
commite5f38ec3c5d8553413501e6141932b8ccc7aceb4 (patch)
tree2e7b9b007e8c1dee6bbcdf14bc1ce42b4f860702 /git-merge-ours.sh
parentrefs.c: convert it to use lockfile interface. (diff)
downloadtgif-e5f38ec3c5d8553413501e6141932b8ccc7aceb4.tar.xz
ref-log: style fixes.
A few style fixes to get the code in line with the rest. - asterisk to make a type a pointer to something goes in front of the variable, not at the end of the base type. E.g. a pointer to an integer is "int *ip", not "int* ip". - open parenthesis for function parameter list, unlike syntactic constructs, comes immediately after the function name. E.g. "if (foo) bar();" not "if(foo) bar ();". - "else" does not come on the same line as the closing brace of corresponding "if". The style is mostly a matter of personal taste, and people may disagree, but consistency is important. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions