{"thread":{"id":"6074","subject":"[PATCH] Suggest 'add' in am/revert/cherry-pick.","startedAt":"2006-12-22T02:30:17Z","lastAt":"2006-12-22T02:30:17Z","messageCount":1,"participants":["Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"30003","messageId":"20061222023017.GA15136@spearce.org","threadId":"6074","inReplyTo":null,"subject":"[PATCH] Suggest 'add' in am/revert/cherry-pick.","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2006-12-22T02:30:17Z","receivedAt":"2006-12-22T02:30:17Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Now that we have decided to make 'add' behave like 'update-index'\n(and therefore fully classify update-index as strictly plumbing)\nthe am/revert/cherry-pick family of commands should not steer the\nuser towards update-index.  Instead send them to the command they\nprobably already know, 'add'.\n\nSigned-off-by: Shawn O. Pearce <spearce@spearce.org>\n---\n git-am.sh     |    4 ++--\n git-revert.sh |    2 +-\n 2 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/git-am.sh b/git-am.sh\nindex 5df6787..0126a77 100755\n--- a/git-am.sh\n+++ b/git-am.sh\n@@ -401,14 +401,14 @@ do\n \t\tchanged=\"$(git-diff-index --cached --name-only HEAD)\"\n \t\tif test '' = \"$changed\"\n \t\tthen\n-\t\t\techo \"No changes - did you forget update-index?\"\n+\t\t\techo \"No changes - did you forget to use 'git add'?\"\n \t\t\tstop_here_user_resolve $this\n \t\tfi\n \t\tunmerged=$(git-ls-files -u)\n \t\tif test -n \"$unmerged\"\n \t\tthen\n \t\t\techo \"You still have unmerged paths in your index\"\n-\t\t\techo \"did you forget update-index?\"\n+\t\t\techo \"did you forget to use 'git add'?\"\n \t\t\tstop_here_user_resolve $this\n \t\tfi\n \t\tapply_status=0\ndiff --git a/git-revert.sh b/git-revert.sh\nindex 6eab3c7..50cc47b 100755\n--- a/git-revert.sh\n+++ b/git-revert.sh\n@@ -155,7 +155,7 @@ Conflicts:\n \t\tuniq\n \t    } >>\"$GIT_DIR/MERGE_MSG\"\n \t    echo >&2 \"Automatic $me failed.  After resolving the conflicts,\"\n-\t    echo >&2 \"mark the corrected paths with 'git-update-index <paths>'\"\n+\t    echo >&2 \"mark the corrected paths with 'git-add <paths>'\"\n \t    echo >&2 \"and commit the result.\"\n \t    case \"$me\" in\n \t    cherry-pick)\n-- \n1.4.4.3.g87d8\n"}]}