]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7e13d65 6605fb7)
Merge branch 'ah/rebase-merges-config'
authorJunio C Hamano <gitster@pobox.com>
Tue, 4 Apr 2023 21:28:27 +0000 (14:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 4 Apr 2023 21:28:28 +0000 (14:28 -0700)
commit9142fce9b09dbc12cd99704d3ea0899efb350c39
tree370ffc7181d89310d9fd9154eee50965ae85dd36tree | snapshot
parent7e13d654c23fd02e3e777754b379b03521833d7ccommit | diff
parent6605fb70cb79776af9e20c0300dc66563a300b42commit | diff
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
builtin/rebase.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.