summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-03-02 12:44:11 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-03-02 12:44:11 -0800
commit77b30bcecd84225a21a8639c272fde88180f36d9 (patch)
tree0d2b1d071c37b119943a88c195ff2bfd50e3f500 /merge-recursive.c
parentMerge branch 'jn/gitweb-config-error-die' (diff)
parentmove encode_in_pack_object_header() to a better place (diff)
downloadtgif-77b30bcecd84225a21a8639c272fde88180f36d9.tar.xz
Merge branch 'ml/encode-header-refactor'
* ml/encode-header-refactor: move encode_in_pack_object_header() to a better place refactor duplicated encode_header in pack-objects and fast-import
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions