Merge branch 'cw/ci-ghwf-check-ws-errors'

Junio C Hamano committed almost 6 years ago

Merge branch 'rs/worktree-list-show-locked'

Junio C Hamano committed almost 6 years ago

Merge branch 'rs/pack-write-hashwrite-simplify'

Junio C Hamano committed almost 6 years ago

Merge branch 'sd/prompt-local-variable'

Junio C Hamano committed almost 6 years ago

Merge branch 'rs/clear-commit-marks-in-repo'

Junio C Hamano committed almost 6 years ago

Merge branch 'so/format-patch-doc-on-default-diff-format'

Junio C Hamano committed almost 6 years ago

mergetool: avoid letting `list_tool_variants` break user-defined setups

Johannes Schindelin committed almost 6 years ago

mergetools/bc: add `bc4` to the alias list for Beyond Compare

Johannes Schindelin committed almost 6 years ago

Merge branch 'en/strmap' into en/merge-ort-impl

Junio C Hamano committed almost 6 years ago

shortlog: use strset from strmap.h

Elijah Newren committed almost 6 years ago

Use new HASHMAP_INIT macro to simplify hashmap initialization

Elijah Newren committed almost 6 years ago

strmap: take advantage of FLEXPTR_ALLOC_STR when relevant

Elijah Newren committed almost 6 years ago

strmap: enable allocations to come from a mem_pool

Elijah Newren committed almost 6 years ago

receive-pack: use default version 0 for proc-receive

Jiang Xin committed almost 6 years ago

receive-pack: gently write messages to proc-receive

Jiang Xin committed almost 6 years ago

t5411: new helper filter_out_user_friendly_and_stable_output

Jiang Xin committed almost 6 years ago

config.mak.uname: remove unused NEEDS_SSL_WITH_CURL flag

Ævar Arnfjörð Bjarmason committed almost 6 years ago

config.mak.uname: remove unused the NO_R_TO_GCC_LINKER flag

Ævar Arnfjörð Bjarmason committed almost 6 years ago

compat/bswap.h: don't assume MSVC is little-endian

Daniel Gurney committed almost 6 years ago

t7800: simplify difftool test

Jinoh Kang committed almost 6 years ago