{"thread":{"id":"14614","subject":"[PATCH] rebase -i: When an 'edit' stops, mention the commit","startedAt":"2008-07-23T07:46:35Z","lastAt":"2008-07-23T09:10:34Z","messageCount":2,"participants":["Johannes Sixt","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"84444","messageId":"4886E1DB.7020308@viscovery.net","threadId":"14614","inReplyTo":null,"subject":"[PATCH] rebase -i: When an 'edit' stops, mention the commit","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2008-07-23T07:46:35Z","receivedAt":"2008-07-23T07:46:35Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"From: Johannes Sixt <johannes.sixt@telecom.at>\n\nIn a rebase session where more than one commit is to be 'edit'ed, and the\nuser spends considerable time to 'edit' a commit, it is easy to forget what\none wanted to 'edit' at the individual commits. It would be helpful to see\nat which commit the rebase stopped.\n\nIncidentally, if the rebase stopped due to merge conflicts or other errors,\nthe commit was already reported (\"Could not apply $sha1...\"), but when\nrebase stopped after successfully applying an \"edit\" commit, it would not\nmention it. With this change the commit is reported.\n\nSigned-off-by: Johannes Sixt <johannes.sixt@telecom.at>\n---\n git-rebase--interactive.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex e63a864..4e334ba 100755\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -277,7 +277,7 @@ do_next () {\n \t\t\tdie_with_patch $sha1 \"Could not apply $sha1... $rest\"\n \t\tmake_patch $sha1\n \t\t: > \"$DOTEST\"/amend\n-\t\twarn\n+\t\twarn \"Stopped at $sha1... $rest\"\n \t\twarn \"You can amend the commit now, with\"\n \t\twarn\n \t\twarn \"\tgit commit --amend\"\n-- \n1.6.0.rc0.956.g7bc0\n\n\t\n"},{"id":"84450","messageId":"alpine.DEB.1.00.0807231110000.2830@eeepc-johanness","threadId":"14614","inReplyTo":"4886E1DB.7020308@viscovery.net","subject":"Re: [PATCH] rebase -i: When an 'edit' stops, mention the commit","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-07-23T09:10:34Z","receivedAt":"2008-07-23T09:10:34Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 23 Jul 2008, Johannes Sixt wrote:\n\n> In a rebase session where more than one commit is to be 'edit'ed, and \n> the user spends considerable time to 'edit' a commit, it is easy to \n> forget what one wanted to 'edit' at the individual commits. It would be \n> helpful to see at which commit the rebase stopped.\n\n\"... So mention it.\"\n\nACK.\n\nCiao,\nDscho\n"}]}