{"thread":{"id":"8401","subject":"[PATCH] git-rebase: suggest to use git-add instead of git-update-index","startedAt":"2007-06-02T17:59:49Z","lastAt":"2007-06-02T19:07:20Z","messageCount":2,"participants":["Jonas Fonseca","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"43816","messageId":"20070602175949.GB19952@diku.dk","threadId":"8401","inReplyTo":null,"subject":"[PATCH] git-rebase: suggest to use git-add instead of git-update-index","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2007-06-02T17:59:49Z","receivedAt":"2007-06-02T17:59:49Z","isPatch":true,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":"The command is part of the main porcelain making git-add more\nappropriate.\n\nSigned-off-by: Jonas Fonseca <fonseca@diku.dk>\n---\n git-rebase.sh |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\n I don't know if this is good or not, maybe it is a matter of taste, but\n as a new git user I prefer to use git add.\n\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex 61770b5..2aa3a01 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -55,7 +55,7 @@ continue_merge () {\n \tif test -n \"$unmerged\"\n \tthen\n \t\techo \"You still have unmerged paths in your index\"\n-\t\techo \"did you forget update-index?\"\n+\t\techo \"did you forget to use git add?\"\n \t\tdie \"$RESOLVEMSG\"\n \tfi\n \n@@ -126,7 +126,7 @@ do\n \t--continue)\n \t\tgit-diff-files --quiet || {\n \t\t\techo \"You must edit all merge conflicts and then\"\n-\t\t\techo \"mark them as resolved using git update-index\"\n+\t\t\techo \"mark them as resolved using git add\"\n \t\t\texit 1\n \t\t}\n \t\tif test -d \"$dotest\"\n-- \n1.5.2.816.gc5560-dirty\n\n-- \nJonas Fonseca\n"},{"id":"43824","messageId":"7v4plqqion.fsf@assigned-by-dhcp.cox.net","threadId":"8401","inReplyTo":"20070602175949.GB19952@diku.dk","subject":"Re: [PATCH] git-rebase: suggest to use git-add instead of git-update-index","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-06-02T19:07:20Z","receivedAt":"2007-06-02T19:07:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonas Fonseca <fonseca@diku.dk> writes:\n\n> The command is part of the main porcelain making git-add more\n> appropriate.\n>\n> Signed-off-by: Jonas Fonseca <fonseca@diku.dk>\n> ---\n>  git-rebase.sh |    4 ++--\n>  1 files changed, 2 insertions(+), 2 deletions(-)\n>\n>  I don't know if this is good or not, maybe it is a matter of taste, but\n>  as a new git user I prefer to use git add.\n\nI like it.  Thanks.\n"}]}