diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-02-03 16:08:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-03 16:08:21 -0800 |
| commit | 2c6e5b32aa09d0c21bc9b1d6b74ce3fb94e787aa (patch) | |
| tree | d43a9a6c0264c089ffd366ec15df10dfc80d0ebe /commit.h | |
| parent | Merge branch 'as/ssh-signing-improve-key-missing-error' (diff) | |
| parent | rebase: provide better error message for apply options vs. merge config (diff) | |
| download | git-2c6e5b32aa09d0c21bc9b1d6b74ce3fb94e787aa.tar.gz git-2c6e5b32aa09d0c21bc9b1d6b74ce3fb94e787aa.zip | |
Merge branch 'en/rebase-incompatible-opts'
"git rebase" often ignored incompatible options instead of
complaining, which has been corrected.
* en/rebase-incompatible-opts:
rebase: provide better error message for apply options vs. merge config
rebase: put rebase_options initialization in single place
rebase: fix formatting of rebase --reapply-cherry-picks option in docs
rebase: clarify the OPT_CMDMODE incompatibilities
rebase: add coverage of other incompatible options
rebase: fix incompatiblity checks for --[no-]reapply-cherry-picks
rebase: fix docs about incompatibilities with --root
rebase: remove --allow-empty-message from incompatible opts
rebase: flag --apply and --merge as incompatible
rebase: mark --update-refs as requiring the merge backend
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions