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

doc: status.showUntrackedFiles does not take "false"

Jonas Wunderlich committed over 2 years ago

t5601: exercise clones with "includeIf.*.onbranch"

Patrick Steinhardt committed over 2 years ago

Documentation/user-manual.txt: example for generating object hashes

Dirk Gouders committed over 2 years ago

config: allow multi-byte core.commentChar

Jeff King committed over 2 years ago

environment: drop comment_line_char compatibility macro

Jeff King committed over 2 years ago

wt-status: drop custom comment-char stringification

Jeff King committed over 2 years ago

sequencer: handle multi-byte comment characters when writing todo list

Jeff King committed over 2 years ago

find multi-byte comment chars in unterminated buffers

Jeff King committed over 2 years ago