Merge branch 'rs/combine-diff-with-incompatible-options'

Junio C Hamano committed about 4 years ago

ref-filter: disable save_commit_buffer while traversing

Jeff King committed about 4 years ago

clone: move unborn head creation to update_head()

Jeff King committed about 4 years ago

remote-curl: send Accept-Language header to server

Li Linchao committed about 4 years ago

gpg-interface: add function for converting trust level to string

Jaydeep Das committed about 4 years ago

multi-pack-index: simplify handling of unknown --options

SZEDER Gábor committed about 4 years ago

cocci: avoid normalization rules for memcpy

René Scharfe committed about 4 years ago

sha256: add support for Nettle

brian m. carlson committed about 4 years ago

builtin/mv.c: use the MOVE_ARRAY() macro instead of memmove()

Junio C Hamano committed about 4 years ago

vimdiff: make layout engine more robust against user vim settings

Fernando Ramos committed about 4 years ago

xdiff: introduce XDL_ALLOC_GROW()

Phillip Wood committed about 4 years ago

xdiff: introduce XDL_CALLOC_ARRAY()

Phillip Wood committed about 4 years ago

xdiff: introduce xdl_calloc

Phillip Wood committed about 4 years ago

xdiff: introduce XDL_ALLOC_ARRAY()

Phillip Wood committed about 4 years ago

git-p4: fix bug with encoding of p4 client name

Kilian Kilger committed about 4 years ago

clone: use remote branch if it matches default HEAD

Jeff King committed about 4 years ago

clone: propagate empty remote HEAD even with other branches

Jeff King committed about 4 years ago

clone: drop extra newline from warning message

Jeff King committed about 4 years ago

cocci: generalize "unused" rule to cover more than "strbuf"

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

cocci: add and apply a rule to find "unused" strbufs

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