{"thread":{"id":"23944","subject":"[PATCH] Improve error message in rebase conflict","startedAt":"2010-05-30T12:20:44Z","lastAt":"2010-05-30T13:35:46Z","messageCount":3,"participants":["Ramkumar Ramachandra","Sverre Rabbelier"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"142569","messageId":"1275222044-511-1-git-send-email-artagnon@gmail.com","threadId":"23944","inReplyTo":null,"subject":"[PATCH] Improve error message in rebase conflict","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2010-05-30T12:20:44Z","receivedAt":"2010-05-30T12:20:44Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"When the index is unchanged during a rebase conflict resolution,\nprompt the user to \"git add\", or alternatively drop the patch using\n\"git rebase --skip\".\n\nNoticed-by: Dale Rowley <ddrowley@gmail.com>\nSigned-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\n---\n git-am.sh     |    4 +++-\n git-rebase.sh |    4 ++--\n 2 files changed, 5 insertions(+), 3 deletions(-)\n\ndiff --git a/git-am.sh b/git-am.sh\nindex 87ffae2..3c46f60 100755\n--- a/git-am.sh\n+++ b/git-am.sh\n@@ -725,7 +725,9 @@ do\n \t\t# working tree.\n \t\tresolved=\n \t\tgit diff-index --quiet --cached HEAD -- && {\n-\t\t\techo \"No changes - did you forget to use 'git add'?\"\n+\t\t\techo \"No changes - did you forget to use 'git add'? \" \\\n+\t\t\t\t\"If you dropped the changes introduced by the patch, \" \\\n+\t\t\t\t\"you should use \\\"$cmdline --skip\\\".\"\n \t\t\tstop_here_user_resolve $this\n \t\t}\n \t\tunmerged=$(git ls-files -u)\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex 44f5c65..60cc0e9 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -217,8 +217,8 @@ do\n \t\t\tdie \"No rebase in progress?\"\n \n \t\tgit diff-files --quiet --ignore-submodules || {\n-\t\t\techo \"You must edit all merge conflicts and then\"\n-\t\t\techo \"mark them as resolved using git add\"\n+\t\t\techo \"You must edit all merge conflicts and then\" \\\n+\t\t\t    \"mark them as resolved using 'git add'\"\n \t\t\texit 1\n \t\t}\n \t\tif test -d \"$dotest\"\n-- \n1.7.1\n"},{"id":"142571","messageId":"AANLkTimiZlampV3xmfCyIhb1wbCUpGGYxtZpEYnmHIr1@mail.gmail.com","threadId":"23944","inReplyTo":"1275222044-511-1-git-send-email-artagnon@gmail.com","subject":"Re: [PATCH] Improve error message in rebase conflict","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2010-05-30T12:44:52Z","receivedAt":"2010-05-30T12:44:52Z","isPatch":true,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Sun, May 30, 2010 at 14:20, Ramkumar Ramachandra <artagnon@gmail.com> wrote:\n>                git diff-files --quiet --ignore-submodules || {\n> -                       echo \"You must edit all merge conflicts and then\"\n> -                       echo \"mark them as resolved using git add\"\n> +                       echo \"You must edit all merge conflicts and then\" \\\n> +                           \"mark them as resolved using 'git add'\"\n\nWhy is this change not described in the commit message? :)\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"142572","messageId":"AANLkTilqMg-QFo5KVA1IjwnddxRYULYh4pbxbsC6TB5W@mail.gmail.com","threadId":"23944","inReplyTo":"AANLkTimiZlampV3xmfCyIhb1wbCUpGGYxtZpEYnmHIr1@mail.gmail.com","subject":"Re: [PATCH] Improve error message in rebase conflict","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2010-05-30T13:35:46Z","receivedAt":"2010-05-30T13:35:46Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Hi,\n\nSverre Rabbelier wrote:\n> Why is this change not described in the commit message? :)\n\nI thought it was too trivial to describe. Anyway, here's one:\n++ Additionally, fix a line break in a message in git-rebase.sh\n\n-- Ram\n"}]}