summaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-04-03 12:32:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-04-03 12:32:35 -0700
commit3967c995eed9f4046a1dde5ef520d1dbcdedfab8 (patch)
tree3d4d615a457d845a3b0dd15f6b4d3ad4dc5d3f60 /setup.c
parentMerge branch 'mm/maint-log-n-with-diff-filtering' into maint (diff)
parentlist-objects.c: don't add an unparsed NULL as a pending tree (diff)
downloadtgif-3967c995eed9f4046a1dde5ef520d1dbcdedfab8.tar.xz
Merge branch 'jc/maint-rev-list-culled-boundary' into maint
* jc/maint-rev-list-culled-boundary: list-objects.c: don't add an unparsed NULL as a pending tree Conflicts: list-objects.c
Diffstat (limited to 'setup.c')
0 files changed, 0 insertions, 0 deletions