summaryrefslogtreecommitdiff
path: root/cache-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-04-18 14:18:25 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-18 14:18:25 -0700
commiteb8a1c4aed2728e1be1c5e39fb9e5a3f4b209fc4 (patch)
treeb20cc784a712eb89f3f1392950472f95ed245966 /cache-tree.c
parentdoc/git-daemon: add missing arguments to max-connections option (diff)
parentsimplify output of conflicting merge (diff)
downloadtgif-eb8a1c4aed2728e1be1c5e39fb9e5a3f4b209fc4.tar.xz
Merge branch 'cb/maint-merge-recursive-submodule-fix' into maint
* cb/maint-merge-recursive-submodule-fix: simplify output of conflicting merge update cache for conflicting submodule entries add tests for merging with submodules
Diffstat (limited to 'cache-tree.c')
0 files changed, 0 insertions, 0 deletions