summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-08 21:35:59 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-08 21:35:59 -0700
commitf14883b972f3d6b104c4d141fc3de34af9ba0b24 (patch)
treef745b382d02a707139c806197c9dd932e35853e2 /Documentation/gitattributes.txt
parentMerge branch 'rs/merge-add-strategies-simplification' into maint (diff)
parentmerge-recursive: use STRING_LIST_INIT_NODUP (diff)
downloadtgif-f14883b972f3d6b104c4d141fc3de34af9ba0b24.tar.xz
Merge branch 'rs/merge-recursive-string-list-init' into maint
A small code clean-up. * rs/merge-recursive-string-list-init: merge-recursive: use STRING_LIST_INIT_NODUP
Diffstat (limited to 'Documentation/gitattributes.txt')
0 files changed, 0 insertions, 0 deletions