summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-06-30 13:45:23 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-06-30 13:45:23 -0700
commit9bab852f652bdd91752f9c4d990a86cb35731ba6 (patch)
treedf3f8a6c98ed2e39eb753385d6d58062bb1d30d0 /ll-merge.c
parentMerge branch 'ks/submodule-add-doc' (diff)
parentdoc: clarify syntax for %C(auto,...) in pretty formats (diff)
downloadtgif-9bab852f652bdd91752f9c4d990a86cb35731ba6.tar.xz
Merge branch 'ah/doc-pretty-color-auto-prefix'
Doc update. * ah/doc-pretty-color-auto-prefix: doc: clarify syntax for %C(auto,...) in pretty formats
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions