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
Jinoh Kang committed almost 6 years ago
add -i (built-in): use correct names to load color.diff.* config
Johannes Schindelin committed almost 6 years ago
add -i (built-in): prevent the `reset` "color" from being configured
Johannes Schindelin committed almost 6 years ago
add -i: use `reset_color` consistently
Johannes Schindelin committed almost 6 years ago
add -p (built-in): imitate `xdl_format_hunk_hdr()` generating hunk headers
Johannes Schindelin committed almost 6 years ago
add -i (built-in): send error messages to stderr
Johannes Schindelin committed almost 6 years ago
add -i (built-in): do show an error message for incorrect inputs
Johannes Schindelin committed almost 6 years ago