trailer: begin formatting unification

Linus Arver committed over 2 years ago

format_trailer_info(): append newline for non-trailer lines

Linus Arver committed over 2 years ago

format_trailer_info(): drop redundant unfold_value()

Linus Arver committed over 2 years ago

format_trailer_info(): use trailer_item objects

Linus Arver committed over 2 years ago

t5300: fix test_with_bad_commit()

John Cai committed over 2 years ago

diff: add diff.srcPrefix and diff.dstPrefix configuration variables

Peter Hutterer committed over 2 years ago

The seventh batch

Junio C Hamano committed over 2 years ago

Merge branch 'rj/complete-worktree-paths-fix'

Junio C Hamano committed over 2 years ago

Merge branch 'rj/complete-reflog'

Junio C Hamano committed over 2 years ago

Merge branch 'jc/test-i18ngrep'

Junio C Hamano committed over 2 years ago

Merge branch 'gt/core-bare-in-templates'

Junio C Hamano committed over 2 years ago

Merge branch 'la/trailer-api'

Junio C Hamano committed over 2 years ago

Merge branch 'kh/doc-commentchar-is-a-byte'

Junio C Hamano committed over 2 years ago

Merge branch 'jh/fsmonitor-icase-corner-case-fix'

Junio C Hamano committed over 2 years ago

Merge branch 'ps/reftable-iteration-perf-part2'

Junio C Hamano committed over 2 years ago

Merge branch 'so/clean-dry-run-without-force'

Junio C Hamano committed over 2 years ago

checkout: plug some leaks in git-restore

Rubén Justo committed over 2 years ago

checkout: fix interaction between --conflict and --merge

Phillip Wood committed over 2 years ago

checkout: cleanup --conflict=<style> parsing

Phillip Wood committed over 2 years ago

merge options: add a conflict style member

Phillip Wood committed over 2 years ago