Merge branch 'fr/vimdiff-layout-fix'

Junio C Hamano committed about 4 years ago

cat-file: add mailmap support

Siddharth Asthana committed about 4 years ago

ident: rename commit_rewrite_person() to apply_mailmap_to_header()

Siddharth Asthana committed about 4 years ago

ident: move commit_rewrite_person() to ident.c

Siddharth Asthana committed about 4 years ago

revision: improve commit_rewrite_person()

Siddharth Asthana committed about 4 years ago

pack-bitmap.c: continue looping when first MIDX bitmap is found

Teng Long committed about 4 years ago

pack-bitmap.c: using error() instead of silently returning -1

Teng Long committed about 4 years ago

pack-bitmap.c: do not ignore error when opening a bitmap file

Teng Long committed about 4 years ago

pack-bitmap.c: rename "idx_name" to "bitmap_name"

Teng Long committed about 4 years ago

pack-bitmap.c: mark more strings for translations

Teng Long committed about 4 years ago

pack-bitmap.c: fix formatting of error messages

Teng Long committed about 4 years ago

scalar: convert README.md into a technical design doc

Victoria Dye committed about 4 years ago

scalar: reword command documentation to clarify purpose

Victoria Dye committed about 4 years ago

t4200: drop irrelevant code

Martin Ågren committed about 4 years ago

trace2: only include "fsync" events if we git_fsync()

Ævar Arnfjörð Bjarmason committed about 4 years ago

config/core.txt: fix minor issues for `core.sparseCheckoutCone`

Martin Ågren committed about 4 years ago

index-format.txt: remove outdated list of supported extensions

SZEDER Gábor committed about 4 years ago

mergesort: remove llist_mergesort()

René Scharfe committed about 4 years ago

packfile: use DEFINE_LIST_SORT

René Scharfe committed about 4 years ago

fetch-pack: use DEFINE_LIST_SORT

René Scharfe committed about 4 years ago