Merge branch 'jt/avoid-prefetch-when-able-in-diff'

Junio C Hamano committed over 6 years ago

Merge branch 'gp/hppa-stack-test-fix'

Junio C Hamano committed over 6 years ago

sparse: allow '{ 0 }' to be used without warnings

Luc Van Oostenryck committed over 6 years ago

stateless-connect: send response end packet

Denton Liu committed over 6 years ago

pkt-line: define PACKET_READ_RESPONSE_END

Denton Liu committed over 6 years ago

remote-curl: error on incomplete packet

Denton Liu committed over 6 years ago

diff: add config option relative

Laurent Arnoud committed over 6 years ago

t5608: avoid say() and use "skip_all" instead for consistency

Carlo Marcelo Arenas Belón committed over 6 years ago

checkout: improve error messages for -b with extra argument

René Scharfe committed over 6 years ago

checkout: add tests for -b and --track

René Scharfe committed over 6 years ago

bisect--helper: avoid segfault with bad syntax in `start --term-*`

Carlo Marcelo Arenas Belón committed over 6 years ago

l10n: Update Catalan translation

Jordi Mas committed over 6 years ago

completion: don't override given stash subcommand with -p

Ville Skyttä committed over 6 years ago

Merge https://github.com/prati0100/git-gui

Junio C Hamano committed over 6 years ago

fsck: detect more in-tree d/f conflicts

René Scharfe committed over 6 years ago

t1450: demonstrate undetected in-tree d/f conflict

René Scharfe committed over 6 years ago

t1450: increase test coverage of in-tree d/f detection

René Scharfe committed over 6 years ago

fsck: fix a typo in a comment

René Scharfe committed over 6 years ago

doc: fix wrong 4-byte length of pkt-line message

Jiuyang Xie committed over 6 years ago

t2060: add a test for switch with --orphan and --discard-changes

brian m. carlson committed over 6 years ago