Merge branch 'la/doc-choose-starting-point'

Junio C Hamano committed about 3 years ago

docs: update when `git bisect visualize` uses `gitk`

Matthias Aßhauer committed about 3 years ago

compat/mingw: implement a native locate_in_PATH()

Matthias Aßhauer committed about 3 years ago

run-command: conditionally define locate_in_PATH()

Matthias Aßhauer committed about 3 years ago

rebase --skip: fix commit message clean up when skipping squash

Phillip Wood committed about 3 years ago

ident: don't consider '.' a crud

brian m. carlson committed about 3 years ago

The eighteenth batch

Junio C Hamano committed about 3 years ago

Documentation/RelNotes/2.42.0.txt: typofix

Taylor Blau committed about 3 years ago

Merge branch 'ks/ref-filter-describe'

Junio C Hamano committed about 3 years ago

Merge branch 'ah/sequencer-rewrite-todo-fix'

Junio C Hamano committed about 3 years ago

Merge branch 'bb/use-trace2-counters-for-fsync-stats'

Junio C Hamano committed about 3 years ago

Merge branch 'ah/autoconf-fixes'

Junio C Hamano committed about 3 years ago

Merge branch 'jc/tree-walk-drop-base-offset'

Junio C Hamano committed about 3 years ago

avoid SHA-1 functions deprecated in OpenSSL 3+

Eric Wong committed about 3 years ago

sha256: avoid functions deprecated in OpenSSL 3+

Eric Wong committed about 3 years ago

checkout: allow "checkout -m path" to unmerge removed paths

Junio C Hamano committed about 3 years ago

checkout/restore: add basic tests for --merge

Junio C Hamano committed about 3 years ago

checkout/restore: refuse unmerging paths unless checking out of the index

Junio C Hamano committed about 3 years ago

update-index: remove stale fallback code for "--unresolve"

Junio C Hamano committed about 3 years ago

update-index: use unmerge_index_entry() to support removal

Junio C Hamano committed about 3 years ago