Add a command "fixup" to rebase --interactive

The command is like "squash", except that it discards the commit message
of the corresponding commit.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty
2009-12-07 10:20:59 +01:00
committed by Junio C Hamano
parent 163f392590
commit 0205e72f08
4 changed files with 77 additions and 18 deletions

View File

@ -9,8 +9,9 @@
#
# "[<lineno1>] [<lineno2>]..."
#
# If a line number is prefixed with "squash", "edit", or "reword", the
# respective line's command will be replaced with the specified one.
# If a line number is prefixed with "squash", "fixup", "edit", or
# "reword", the respective line's command will be replaced with the
# specified one.
set_fake_editor () {
echo "#!$SHELL_PATH" >fake-editor.sh
@ -32,7 +33,7 @@ cat "$1".tmp
action=pick
for line in $FAKE_LINES; do
case $line in
squash|edit|reword)
squash|fixup|edit|reword)
action="$line";;
*)
echo sed -n "${line}s/^pick/$action/p"