Merge branch 'jk/drop-hg-to-git'

Junio C Hamano committed over 2 years ago

Merge branch 'rs/t-prio-queue-fixes'

Junio C Hamano committed over 2 years ago

Merge branch 'bt/fuzz-config-parse'

Junio C Hamano committed over 2 years ago

Merge branch 'jc/show-untracked-false'

Junio C Hamano committed over 2 years ago

Merge branch 'ph/diff-src-dst-prefix-config'

Junio C Hamano committed over 2 years ago

Merge branch 'eb/hash-transition'

Junio C Hamano committed over 2 years ago

MyFirstObjectWalk: add stderr to pipe processing

Dirk Gouders committed over 2 years ago

MyFirstObjectWalk: fix description for counting omitted objects

Dirk Gouders committed over 2 years ago

MyFirstObjectWalk: fix filtered object walk

Dirk Gouders committed over 2 years ago

MyFirstObjectWalk: fix misspelled "builtins/"

Dirk Gouders committed over 2 years ago

MyFirstObjectWalk: use additional arg in config_fn_t

Dirk Gouders committed over 2 years ago

config: add core.commentString

Jeff King committed over 2 years ago

SubmittingPatches: release-notes entry experiment

Junio C Hamano committed over 2 years ago

cherry-pick: add `--empty` for more robust redundant commit handling

Brian Lyles committed over 2 years ago

cherry-pick: enforce `--keep-redundant-commits` incompatibility

Brian Lyles committed over 2 years ago

sequencer: do not require `allow_empty` for redundant commit options

Brian Lyles committed over 2 years ago

sequencer: handle unborn branch with `--allow-empty`

Brian Lyles committed over 2 years ago

rebase: update `--empty=ask` to `--empty=stop`

Brian Lyles committed over 2 years ago

docs: clean up `--empty` formatting in git-rebase(1) and git-am(1)

Brian Lyles committed over 2 years ago

docs: address inaccurate `--empty` default with `--exec`

Brian Lyles committed over 2 years ago