combine-diff: coalesce lost lines optimally

Antoine Pelisse committed over 13 years ago

Second wave of topics toward 1.8.3

Junio C Hamano committed over 13 years ago

Merge branch 'jk/fully-peeled-packed-ref'

Junio C Hamano committed over 13 years ago

Merge branch 'jk/fast-export-object-lookup'

Junio C Hamano committed over 13 years ago

Merge branch 'jk/peel-ref'

Junio C Hamano committed over 13 years ago

Merge branch 'lf/setup-prefix-pathspec'

Junio C Hamano committed over 13 years ago

Merge branch 'ph/tag-force-no-warn-on-creation'

Junio C Hamano committed over 13 years ago

Merge branch 'mg/unsigned-time-t'

Junio C Hamano committed over 13 years ago

Merge branch 'jk/suppress-clang-warning'

Junio C Hamano committed over 13 years ago

Merge branch 'pw/p4-symlinked-root'

Junio C Hamano committed over 13 years ago

Merge branch 'jk/empty-archive'

Junio C Hamano committed over 13 years ago

Merge branch 'ks/rfc2047-one-char-at-a-time'

Junio C Hamano committed over 13 years ago

Merge branch 'jk/alias-in-bare'

Junio C Hamano committed over 13 years ago

Merge branch 'jc/push-follow-tag'

Junio C Hamano committed over 13 years ago

Merge branch 'jc/maint-reflog-expire-clean-mark-typofix'

Junio C Hamano committed over 13 years ago

Merge branch 'ap/maint-diff-rename-avoid-overlap'

Junio C Hamano committed over 13 years ago

Merge branch 'jl/submodule-deinit'

Junio C Hamano committed over 13 years ago

Merge branch 'jc/describe'

Junio C Hamano committed over 13 years ago

Merge branch 'pe/pull-rebase-v-q'

Junio C Hamano committed over 13 years ago

Merge branch 'maint'

Junio C Hamano committed over 13 years ago