summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-08-24 12:05:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-08-24 12:05:35 -0700
commit9dd8175be629c9ed5a102a42df1e6cc3f187eb64 (patch)
tree128eaa2a66e615cd6dce7e0dcda5f7330316c0f2 /Documentation/git-merge-index.txt
parentMerge branch 'jc/tag-doc' into maint-1.7.11 (diff)
parentDocumentation/CodingGuidelines: spell out more shell guidelines (diff)
downloadtgif-9dd8175be629c9ed5a102a42df1e6cc3f187eb64.tar.xz
Merge branch 'hv/coding-guidelines' into maint-1.7.11
In earlier days, "imitate the style in the neibouring code" was sufficient to keep the coherent style, but over time some parts of the codebase have drifted enough to make it ineffective. * hv/coding-guidelines: Documentation/CodingGuidelines: spell out more shell guidelines
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions