{"thread":{"id":"3121","subject":"[PATCH] minor git-reset and git-commit documentation fixes","startedAt":"2006-01-21T23:54:11Z","lastAt":"2006-01-21T23:54:11Z","messageCount":1,"participants":["J. Bruce Fields"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"15014","messageId":"E1F0SYd-0005iu-UY@puzzle.fieldses.org","threadId":"3121","inReplyTo":null,"subject":"[PATCH] minor git-reset and git-commit documentation fixes","fromName":"J. Bruce Fields","fromEmail":"bfields@fieldses.org","sentAt":"2006-01-21T23:54:11Z","receivedAt":"2006-01-21T23:54:11Z","isPatch":true,"sender":{"key":"bfields@citi.umich.edu","avatar":null},"body":"Minor copyediting of recent additions to git-commit and git-reset documentation\n\nSigned-off-by: J. Bruce Fields <bfields@citi.umich.edu>\n\n---\n\n Documentation/git-commit.txt |    2 +-\n Documentation/git-reset.txt  |    8 ++++----\n 2 files changed, 5 insertions(+), 5 deletions(-)\n\n18d55bf231ae7116e0f0c4da144de46fe0cb2cbf\ndiff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt\nindex e35984d..72f96fc 100644\n--- a/Documentation/git-commit.txt\n+++ b/Documentation/git-commit.txt\n@@ -27,7 +27,7 @@ OPTIONS\n -a|--all::\n \tUpdate all paths in the index file.  This flag notices\n \tfiles that have been modified and deleted, but new files\n-\tyou have not told about git are not affected.\n+\tyou have not told git about are not affected.\n \n -c or -C <commit>::\n \tTake existing commit object, and reuse the log message\ndiff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt\nindex 315683a..b4e737e 100644\n--- a/Documentation/git-reset.txt\n+++ b/Documentation/git-reset.txt\n@@ -147,8 +147,8 @@ and resets the tip of the branch to that\n \n Interrupted workflow::\n +\n-You can get interrupted by an ungent fix request while you are\n-still in the middle of a large change.  The files in your\n+Suppose you are interrupted by an urgent fix request while you\n+are in the middle of a large change.  The files in your\n working tree are not in any shape to be committed yet, but you\n need to get to the other branch for a quick bugfix.\n +\n@@ -164,8 +164,8 @@ $ git reset --soft HEAD^ ;# go back to W\n $ git reset <3>\n \n <1> This commit will get blown away so a throw-away log message is OK.\n-<2> This removes the 'WIP' commit from the commit history, and makes\n-    your working tree in the state just before you made that snapshot.\n+<2> This removes the 'WIP' commit from the commit history, and sets\n+    your working tree to the state just before you made that snapshot.\n <3> After <2>, the index file still has all the WIP changes you\n     committed in <1>.  This sets it to the last commit you were\n     basing the WIP changes on.\n-- \n0.99.8b-g58e3\n"}]}