diff options
| author | Johannes Sixt <johannes.sixt@telecom.at> | 2008-07-23 09:46:35 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-23 12:02:57 -0700 |
| commit | a8ccc204c5daf4dae4071907499055d2dc9995db (patch) | |
| tree | 4c18ae496933021b41783f0830dcc506ced1a1f2 | |
| parent | e358f3c31e1ae9f653e9b2a6be69f5df53b4ba7e (diff) | |
| download | git-a8ccc204c5daf4dae4071907499055d2dc9995db.tar.gz | |
rebase -i: When an 'edit' stops, mention the commit
In a rebase session where more than one commit is to be 'edit'ed, and the
user spends considerable time to 'edit' a commit, it is easy to forget what
one wanted to 'edit' at the individual commits. It would be helpful to see
at which commit the rebase stopped.
Incidentally, if the rebase stopped due to merge conflicts or other errors,
the commit was already reported ("Could not apply $sha1..."), but when
rebase stopped after successfully applying an "edit" commit, it would not
mention it. With this change the commit is reported.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-rebase--interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index e63a864c7b..4e334ba41d 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -277,7 +277,7 @@ do_next () { die_with_patch $sha1 "Could not apply $sha1... $rest" make_patch $sha1 : > "$DOTEST"/amend - warn + warn "Stopped at $sha1... $rest" warn "You can amend the commit now, with" warn warn " git commit --amend" |