]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ak/rebase-autosquash'
authorJunio C Hamano <gitster@pobox.com>
Sun, 10 Dec 2023 00:37:50 +0000 (16:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Dec 2023 00:37:50 +0000 (16:37 -0800)
"git rebase --autosquash" is now enabled for non-interactive rebase,
but it is still incompatible with the apply backend.

* ak/rebase-autosquash:
  rebase: rewrite --(no-)autosquash documentation
  rebase: support --autosquash without -i
  rebase: fully ignore rebase.autoSquash without -i


Trivial merge