diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-04-03 12:32:35 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-03 12:32:35 -0700 |
commit | 3967c995eed9f4046a1dde5ef520d1dbcdedfab8 (patch) | |
tree | 3d4d615a457d845a3b0dd15f6b4d3ad4dc5d3f60 /diffcore-rename.c | |
parent | Merge branch 'mm/maint-log-n-with-diff-filtering' into maint (diff) | |
parent | list-objects.c: don't add an unparsed NULL as a pending tree (diff) | |
download | tgif-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 'diffcore-rename.c')
0 files changed, 0 insertions, 0 deletions