Merge branch 'rs/subtree-fixes'

Junio C Hamano committed almost 8 years ago

travis-ci: no longer use containers

Sebastian Staudt committed almost 8 years ago

packfile: close multi-pack-index in close_all_packs

Derrick Stolee committed almost 8 years ago

path.c: char is not (always) signed

Torsten Bögershausen committed almost 8 years ago

http: give curl version warnings consistently

Junio C Hamano committed almost 8 years ago

http: when using Secure Channel, ignore sslCAInfo by default

Johannes Schindelin committed almost 8 years ago

http: add support for disabling SSL revocation checks in cURL

Brendan Forster committed almost 8 years ago

branch: introduce --show-current display option

Daniels Umanovskis committed almost 8 years ago

upload-pack: fix broken if/else chain in config callback

Jeff King committed almost 8 years ago

rebase -i: recognize short commands without arguments

Johannes Sixt committed almost 8 years ago

archive: initialize archivers earlier

Josh Steadmon committed almost 8 years ago

compat: make sure git_mmap is not expected to write

Carlo Marcelo Arenas Belón committed almost 8 years ago

range-diff: allow to diff files regardless of submodule config

Lucas De Marchi committed almost 8 years ago

howto/using-merge-subtree: mention --allow-unrelated-histories

Uwe Kleine-König committed almost 8 years ago

doc: document diff/merge.guitool config keys

Denton Liu committed almost 8 years ago

completion: support `git mergetool --[no-]gui`

Denton Liu committed almost 8 years ago

mergetool: accept -g/--[no-]gui as arguments

Denton Liu committed almost 8 years ago

repack -ad: prune the list of shallow commits

Johannes Schindelin committed almost 8 years ago

shallow: offer to prune only non-existing entries

Johannes Schindelin committed almost 8 years ago

repack: point out a bug handling stale shallow info

Johannes Schindelin committed almost 8 years ago