read-cache: add remove_file_from_index_with_flags()

Junio C Hamano committed about 2 months ago

merge-ll: consolidate conflict marker scanning logic

Junio C Hamano committed about 2 months ago

read-cache: reindent

Junio C Hamano committed about 2 months ago

The 9th batch

Junio C Hamano committed about 2 months ago

Merge branch 'ps/odb-move-loose-object-writing'

Junio C Hamano committed about 2 months ago

Merge branch 'tl/gitweb-shorten-hashes-with-modes'

Junio C Hamano committed about 2 months ago

Merge branch 'ps/cat-file-remote-object-info'

Junio C Hamano committed about 2 months ago

Merge branch 'jt/config-lock-timeout'

Junio C Hamano committed about 2 months ago

Merge branch 'tn/stash-avoid-sparse-index-expansion'

Junio C Hamano committed about 2 months ago

Merge branch 'sk/userdiff-swift'

Junio C Hamano committed about 2 months ago

Merge branch 'ty/migrate-excludes-file'

Junio C Hamano committed about 2 months ago

Merge branch 'ty/migrate-trust-executable-bit'

Junio C Hamano committed about 2 months ago

Merge branch 'rs/tempfile-wo-the-repository'

Junio C Hamano committed about 2 months ago

branch: add --dry-run for --delete-merged

Harald Nordgren committed about 2 months ago

branch: add branch.<name>.deleteMerged opt-out

Harald Nordgren committed about 2 months ago

branch: add --delete-merged <pattern>

Harald Nordgren committed about 2 months ago

branch: prepare delete_branches for a bulk caller

Harald Nordgren committed about 2 months ago

branch: let delete_branches skip unmerged branches on bulk refusal

Harald Nordgren committed about 2 months ago

branch: convert delete_branches() to a flags argument

Harald Nordgren committed about 2 months ago

branch: add --forked filter for --list mode

Harald Nordgren committed about 2 months ago