After squashing or fixing up, you may want to have a final look at the
commit, edit some more if needed or even do some testing. --postedit
enables that. This is (to me) a paranoid mode so either I enable it
for all squashes and fixups, or none. Hence a new option, not new todo
commands that give finer selection.

Signed-off-by: Nguyễn Thái Ngọc Duy <>
 Documentation/git-rebase.txt | 5 +++++   | 5 +++++                | 7 +++++++
 3 files changed, 17 insertions(+)

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 2a93c64..dacb163 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -432,6 +432,11 @@ recreates the topic branch with fresh commits so it can be 
 successfully without needing to "revert the reversion" (see the
 link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for 
+       With --interactive, stop after performing the command "squash"
+       or "fixup". This gives the user a chance to look at the final
+       commit and update or test it if needed.
diff --git a/ b/
index a1adae8..42061fc 100644
--- a/
+++ b/
@@ -571,6 +571,11 @@ do_next () {
                record_in_rewritten $sha1
+               if test -n "$postedit"
+               then
+                       warn "Stopped at $sha1... $rest"
+                       exit_with_patch $sha1 0
+               fi
                read -r command rest < "$todo"
diff --git a/ b/
index 5f6732b..2d4beb7 100755
--- a/
+++ b/
@@ -32,6 +32,7 @@ verify             allow pre-rebase hook to run
 rerere-autoupdate  allow rerere to update index with resolved conflicts
 root!              rebase all reachable commits up to the root(s)
 autosquash         move commits that begin with squash!/fixup! under -i
+postedit           stop after squash or fixup commands
 committer-date-is-author-date! passed to 'git am'
 ignore-date!       passed to 'git am'
 whitespace=!       passed to 'git apply'
@@ -264,6 +265,12 @@ do
+       --postedit)
+               postedit=t
+               ;;
+       --no-postedit)
+               postedit=
+               ;;

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to