diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-04-04 14:28:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-04 14:28:28 -0700 |
| commit | 9142fce9b09dbc12cd99704d3ea0899efb350c39 (patch) | |
| tree | 370ffc7181d89310d9fd9154eee50965ae85dd36 /builtin/commit.c | |
| parent | Merge branch 'jk/fast-export-cleanup' (diff) | |
| parent | rebase: add a config option for --rebase-merges (diff) | |
| download | git-9142fce9b09dbc12cd99704d3ea0899efb350c39.tar.gz git-9142fce9b09dbc12cd99704d3ea0899efb350c39.zip | |
Merge branch 'ah/rebase-merges-config'
Streamline --rebase-merges command line option handling and
introduce rebase.merges configuration variable.
* ah/rebase-merges-config:
rebase: add a config option for --rebase-merges
rebase: deprecate --rebase-merges=""
rebase: add documentation and test for --no-rebase-merges
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions