Merge branch 'ob/sequencer-rearrange-cleanup'

Junio C Hamano committed almost 3 years ago

Merge branch 'rj/branch-in-use-error-message'

Junio C Hamano committed almost 3 years ago

sequencer: rectify empty hint in call of require_clean_work_tree()

Oswald Buddenhagen committed almost 3 years ago

Merge branch 'ml/cygwin-fixes'

Pratyush Yadav committed almost 3 years ago

git-gui - use mkshortcut on Cygwin

Mark Levedahl committed about 3 years ago

git-gui - use cygstart to browse on Cygwin

Mark Levedahl committed about 3 years ago

git-gui - remove obsolete Cygwin specific code

Mark Levedahl committed about 3 years ago

git gui Makefile - remove Cygwin modifications

Mark Levedahl committed about 3 years ago

t/t6300: drop magic filtering

Christian Hesse committed about 3 years ago

transfer.unpackLimit: fetch/receive.unpackLimit takes precedence

Junio C Hamano committed about 3 years ago

t/lib-gpg: forcibly run a trustdb update

Christian Hesse committed about 3 years ago

diff: the -w option breaks --exit-code for --raw and other output modes

Junio C Hamano committed about 3 years ago

commit-graph: avoid repeated mixed generation number warnings

Taylor Blau committed about 3 years ago

t/t5318-commit-graph.sh: test generation zero transitions during fsck

Taylor Blau committed about 3 years ago

commit-graph: verify swapped zero/non-zero generation cases

Jeff King committed about 3 years ago

commit-graph: introduce `commit_graph_generation_from_graph()`

Taylor Blau committed about 3 years ago

diff: drop useless "status" parameter from diff_result_code()

Jeff King committed about 3 years ago

diff: drop useless return values in git-diff helpers

Jeff King committed about 3 years ago

diff: drop useless return from run_diff_{files,index} functions

Jeff King committed about 3 years ago

diff: die when failing to read index in git-diff builtin

Jeff King committed about 3 years ago