diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2009-12-07 09:20:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-07 21:50:57 (GMT) |
| commit | 0205e72f088322a70a77643a7cd2d8b23ee07e14 (patch) | |
| tree | 4d723fafa7ea1bc3f27c6210939d1ae8162fa137 /t/lib-rebase.sh | |
| parent | 163f3925902446735b2f631dc44ab67882a93024 (diff) | |
| download | git-0205e72f088322a70a77643a7cd2d8b23ee07e14.zip git-0205e72f088322a70a77643a7cd2d8b23ee07e14.tar.gz git-0205e72f088322a70a77643a7cd2d8b23ee07e14.tar.bz2 | |
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>
Diffstat (limited to 't/lib-rebase.sh')
| -rw-r--r-- | t/lib-rebase.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index 62f452c..f4dda02 100644 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@ -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" |