summaryrefslogtreecommitdiff
path: root/builtin-config.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-11-30 14:44:43 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-11-30 14:44:43 -0800
commit22c4e72d6eef8295a3311f6eb2f82a5494f8b88e (patch)
tree8bffa625a10a3e3e0e60db86ea5017565a1d99fd /builtin-config.c
parentMerge branch 'jc/pretty-lf' (diff)
parentbuiltin-merge.c: call exclude_cmds() correctly. (diff)
downloadtgif-22c4e72d6eef8295a3311f6eb2f82a5494f8b88e.tar.xz
Merge branch 'ap/maint-merge-strategy-list-fix'
Diffstat (limited to 'builtin-config.c')
0 files changed, 0 insertions, 0 deletions