summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-14 12:57:18 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-14 12:57:18 -0800
commit0364bb135e285d4118b69979ade3078fab50e08a (patch)
tree25b765f0b43fd761ba42815a4eae9df3f4bd5545 /merge-recursive.c
parentMerge branch 'jk/grep-binary-attribute' (diff)
parentstandardize and improve lookup rules for external local repos (diff)
downloadtgif-0364bb135e285d4118b69979ade3078fab50e08a.tar.xz
Merge branch 'jk/git-dir-lookup'
* jk/git-dir-lookup: standardize and improve lookup rules for external local repos
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions