summaryrefslogtreecommitdiff
path: root/notes-merge.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-03-12 15:46:53 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-03-12 15:46:54 -0700
commit92b7aacbbc654de4cfae6806bc92cf81ec1823aa (patch)
tree91324fecd7da2165d0e018de9770dde939a0f927 /notes-merge.h
parentMerge branch 'jc/maint-diff-patch-header' into maint (diff)
parentbundle: keep around names passed to add_pending_object() (diff)
downloadtgif-92b7aacbbc654de4cfae6806bc92cf81ec1823aa.tar.xz
Merge branch 'tr/maint-bundle-boundary' into maint
"git bundle" did not record boundary commits correctly when there are many of them. By Thomas Rast * tr/maint-bundle-boundary: bundle: keep around names passed to add_pending_object() t5510: ensure we stay in the toplevel test dir t5510: refactor bundle->pack conversion
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions