summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorStephen Boyd <bebarino@gmail.com>2009-10-15 23:32:33 -0700
committerJunio C Hamano <gitster@pobox.com>2009-10-19 00:49:09 -0700
commit7725cb5e8bfd27887ee0b984b83708eff655ec9e (patch)
tree87a20697dd326f3f6d85ad47de3ca9594be82386 /git-rebase--interactive.sh
parent6741aa6c399dec3d8f0b25699a73b8fcf974d702 (diff)
downloadgit-7725cb5e8bfd27887ee0b984b83708eff655ec9e.tar.gz
rebase -i: fix reword when using a terminal editor
We don't want to use output() on git-commit --amend when rewording the commit message. This leads to confusion as the editor is run in a subshell with it's output saved away, leaving the user with a seemingly frozen terminal. Fix by removing the output part. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
-rwxr-xr-xgit-rebase--interactive.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index a43ee22c64..a1879e3ace 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -346,7 +346,7 @@ do_next () {
mark_action_done
pick_one $sha1 ||
die_with_patch $sha1 "Could not apply $sha1... $rest"
- output git commit --amend
+ git commit --amend
;;
edit|e)
comment_for_reflog edit