merge: do not abort early if one strategy fails to handle the merge

Elijah Newren committed about 4 years ago

merge: abort if index does not match HEAD for trivial merges

Elijah Newren committed about 4 years ago

merge-resolve: abort if index does not match HEAD

Elijah Newren committed about 4 years ago

merge-ort-wrappers: make printed message match the one from recursive

Elijah Newren committed about 4 years ago

builtin/cat-file.c: support NUL-delimited input with `-z`

Taylor Blau committed about 4 years ago

t1006: extract --batch-command inputs to variables

Taylor Blau committed about 4 years ago

The sixth batch

Junio C Hamano committed about 4 years ago

Merge branch 'rs/mingw-tighten-mkstemp'

Junio C Hamano committed about 4 years ago

Merge branch 'js/ci-github-workflow-markup'

Junio C Hamano committed about 4 years ago

Merge branch 'js/shortlog-sort-stably'

Junio C Hamano committed about 4 years ago

Merge branch 'js/vimdiff-quotepath-fix'

Junio C Hamano committed about 4 years ago

Merge branch 'gc/bare-repo-discovery'

Junio C Hamano committed about 4 years ago

read-cache: make `do_read_index()` always set up `istate->repo`

Martin Ågren committed about 4 years ago

Merge branch 'mt/checkout-count-fix' into mt/rot13-in-c

Junio C Hamano committed about 4 years ago

pkt-line.h: move comment closer to the associated code

Matheus Tavares committed about 4 years ago

git-p4: refactoring of p4CmdList()

Kilian Kilger committed about 4 years ago

builtin/remote.c: use the right kind of STRING_LIST_INIT

Junio C Hamano committed about 4 years ago

git-p4: fix error handling in P4Unshelve.renameBranch()

Moritz Baumann committed about 4 years ago

git-p4: fix typo in P4Submit.applyCommit()

Moritz Baumann committed about 4 years ago

git-p4: fix CR LF handling for utf16 files

Moritz Baumann committed about 4 years ago