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

merge-ll: introduce LL_MERGE_OPTIONS_INIT

Phillip Wood committed over 2 years ago

xdiff-interface: refactor parsing of merge.conflictstyle

Phillip Wood committed over 2 years ago

t0006: add more tests with a negative TZ offset

Beat Bolli committed over 2 years ago

date: make "iso-strict" conforming for the UTC timezone

Beat Bolli committed over 2 years ago

status: allow --untracked=false and friends

Junio C Hamano committed over 2 years ago

status: unify parsing of --untracked= and status.showUntrackedFiles

Junio C Hamano committed over 2 years ago