author | Junio C Hamano <gitster@pobox.com> | |
Sun, 3 Apr 2011 19:32:35 +0000 (12:32 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 3 Apr 2011 19:32:35 +0000 (12:32 -0700) | ||
commit | 3967c995eed9f4046a1dde5ef520d1dbcdedfab8 | |
tree | 3d4d615a457d845a3b0dd15f6b4d3ad4dc5d3f60 | tree | snapshot |
parent | 1030536153db404daba4a140d1e3fa1a7ba470a5 | commit | diff |
parent | 6e7d0efa9058aa61147d9d18b33bd046055584e4 | commit | diff |
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
* jc/maint-rev-list-culled-boundary:
list-objects.c: don't add an unparsed NULL as a pending tree
Conflicts:
list-objects.c
list-objects.c | diff1 | | diff2 | | blob | history |