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
resolve-undo: allow resurrecting conflicted state that resolved to deletion
Junio C Hamano committed about 3 years ago
update-index: do not read HEAD and MERGE_HEAD unconditionally
Junio C Hamano committed about 3 years ago
doc: sha256 is no longer experimental
Adam Majer committed about 3 years ago
sha256/gcrypt: die on gcry_md_open failures
Eric Wong committed about 3 years ago
sha256/gcrypt: fix memory leak with SHA-256 repos
Eric Wong committed about 3 years ago
sha256/gcrypt: fix build with SANITIZE=leak
Eric Wong committed about 3 years ago
René Scharfe committed about 3 years ago
Junio C Hamano committed about 3 years ago
Merge branch 'rs/pack-objects-parseopt-fix'
Junio C Hamano committed about 3 years ago
Merge branch 'rs/describe-parseopt-fix'
Junio C Hamano committed about 3 years ago
Merge branch 'bb/trace2-comment-fix'
Junio C Hamano committed about 3 years ago
MyFirstContribution: refrain from self-iterating too much
Junio C Hamano committed about 3 years ago
Junio C Hamano committed about 3 years ago