From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 26 Mar 2021 21:59:03 +0000 (-0700)
Subject: Merge branch 'cm/rebase-i'
X-Git-Tag: v2.32.0-rc0~129
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce4296cf2b6f66d8717e8c3237c9b4be42fb2a1b;p=thirdparty%2Fgit.git

Merge branch 'cm/rebase-i'

"rebase -i" is getting cleaned up and also enhanced.

* cm/rebase-i:
  doc/git-rebase: add documentation for fixup [-C|-c] options
  rebase -i: teach --autosquash to work with amend!
  t3437: test script for fixup [-C|-c] options in interactive rebase
  rebase -i: add fixup [-C | -c] command
  sequencer: use const variable for commit message comments
  sequencer: pass todo_item to do_pick_commit()
  rebase -i: comment out squash!/fixup! subjects from squash message
  sequencer: factor out code to append squash message
  rebase -i: only write fixup-message when it's needed
---

ce4296cf2b6f66d8717e8c3237c9b4be42fb2a1b