summaryrefslogtreecommitdiff
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-04-03 10:56:20 -0700
committerJunio C Hamano <gitster@pobox.com>2024-04-03 10:56:20 -0700
commit17381ab62a2a4634d79c96ee020dce64c3e516b7 (patch)
treede6962838f76a5fda271483c9ce1024214a3e091 /builtin/commit.c
parentd988e80bd3a24387c74810b187a47813f8460699 (diff)
parentec79d763de617905bd9275de0b5941a160d6159b (diff)
Merge branch 'bl/cherry-pick-empty'
Allow git-cherry-pick(1) to automatically drop redundant commits via a new `--empty` option, similar to the `--empty` options for git-rebase(1) and git-am(1). Includes a soft deprecation of `--keep-redundant-commits` as well as some related docs changes and sequencer code cleanup. * bl/cherry-pick-empty: cherry-pick: add `--empty` for more robust redundant commit handling cherry-pick: enforce `--keep-redundant-commits` incompatibility sequencer: do not require `allow_empty` for redundant commit options sequencer: handle unborn branch with `--allow-empty` rebase: update `--empty=ask` to `--empty=stop` docs: clean up `--empty` formatting in git-rebase(1) and git-am(1) docs: address inaccurate `--empty` default with `--exec`
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions