summaryrefslogtreecommitdiff
path: root/Documentation/gitmodules.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-08 21:35:58 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-08 21:35:58 -0700
commit24c88ad8d10c36f4cd2473e6199f901ac485d74e (patch)
treea3282fa401d31149bd9b34ccfb0951e9c7c8c342 /Documentation/gitmodules.txt
parentMerge branch 'ls/packet-line-protocol-doc-fix' into maint (diff)
parentmerge: use string_list_split() in add_strategies() (diff)
downloadtgif-24c88ad8d10c36f4cd2473e6199f901ac485d74e.tar.xz
Merge branch 'rs/merge-add-strategies-simplification' into maint
A small code clean-up. * rs/merge-add-strategies-simplification: merge: use string_list_split() in add_strategies()
Diffstat (limited to 'Documentation/gitmodules.txt')
0 files changed, 0 insertions, 0 deletions