aboutsummaryrefslogtreecommitdiffstats
path: root/builtin-merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-04-30 11:43:37 -0700
committerJunio C Hamano <gitster@pobox.com>2008-04-30 11:43:37 -0700
commite4b9c36ca40a0869ee5fc64aaeabaf2655ef595b (patch)
tree9c532f7347fc0245cd961446ffc886656aa656a0 /builtin-merge-recursive.c
parentDocumentation: point git-prune users to git-gc (diff)
parentfetch-pack: brown paper bag fix (diff)
downloadgit-e4b9c36ca40a0869ee5fc64aaeabaf2655ef595b.tar.gz
git-e4b9c36ca40a0869ee5fc64aaeabaf2655ef595b.zip
Merge branch 'maint'
* maint: fetch-pack: brown paper bag fix
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions