sequencer: teach autostash apply to take optional conflict marker labels

Harald Nordgren committed 3 months ago

sequencer: allow create_autostash to run silently

Harald Nordgren committed 3 months ago

stash: add --label-ours, --label-theirs, --label-base for apply

Harald Nordgren committed 3 months ago

index-pack, unpack-objects: increase input buffer from 4 KiB to 128 KiB

Scott Bauersfeld committed 3 months ago

t5564: use a short path for the SOCKS proxy socket

Johannes Schindelin committed 3 months ago

t2000: consolidate second scenario into a single test block

Zakariyah Ali committed 3 months ago

commit: sign commit after mutating buffer

brian m. carlson committed 3 months ago

commit: name UTF-8 function appropriately

brian m. carlson committed 3 months ago

doc: log: use the same delimiter in description list

Kristoffer Haugsbakk committed 3 months ago

doc: log: fix --decorate description list

Kristoffer Haugsbakk committed 3 months ago

builtin/history: introduce "fixup" subcommand

Patrick Steinhardt committed 3 months ago

builtin/history: generalize function to commit trees

Patrick Steinhardt committed 3 months ago

replay: allow callers to control what happens with empty commits

Patrick Steinhardt committed 3 months ago

safe.bareRepository: default to "explicit" with WITH_BREAKING_CHANGES

Johannes Schindelin committed 3 months ago

status tests: filter `.gitconfig` from status output

Johannes Schindelin committed 3 months ago

ls-files tests: filter `.gitconfig` from `--others` output

Johannes Schindelin committed 3 months ago

t5601: restore `.gitconfig` after includeIf test

Johannes Schindelin committed 3 months ago

t1305: use `--git-dir=.` for bare repo in include cycle test

Johannes Schindelin committed 3 months ago

t1300: remove global config settings injected by test-lib.sh

Johannes Schindelin committed 3 months ago

t7900: do not let `$HOME/.gitconfig` interfere with XDG tests

Johannes Schindelin committed 3 months ago