summaryrefslogtreecommitdiff
path: root/match-trees.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-16 14:27:05 -0700
committerJunio C Hamano <gitster@pobox.com>2015-06-16 14:27:05 -0700
commitc7ca4424ea5644c6aa2c660a4a0726a75f8f2b84 (patch)
tree4acab92baf40a8369e78a396ef343c75522345cd /match-trees.c
parent412e63f0fd683addc380f9c65d05306bd2027039 (diff)
parentfc0aa395f3205a049e917d391e2afa93cda0c8af (diff)
downloadgit-c7ca4424ea5644c6aa2c660a4a0726a75f8f2b84.tar.gz
Merge branch 'sg/merge-summary-config'
Doc updates. * sg/merge-summary-config: Documentation: include 'merge.branchdesc' for merge and config as well
Diffstat (limited to 'match-trees.c')
0 files changed, 0 insertions, 0 deletions