@matheusbsbs / matheus-bagliano / commits / 8278ac2f4a
Fork 0

Minor git-reset and git-commit documentation fixes

Minor copyediting of recent additions to git-commit and git-reset documentation. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>

J. Bruce Fields committed Jan 21, 2006 at 18:54 UTC 8278ac2f4a50a8aca0dca490d2b8b99b11e266e1
2 files changed +5 -5
Documentation/git-commit.txt
+1 -1
@@ -27,7 +27,7 @@ OPTIONS
27 -a|--all::
28 Update all paths in the index file. This flag notices
29 files that have been modified and deleted, but new files
30 - you have not told about git are not affected.
30 + you have not told git about are not affected.
31
32 -c or -C <commit>::
33 Take existing commit object, and reuse the log message
Documentation/git-reset.txt
+4 -4
@@ -147,8 +147,8 @@ and resets the tip of the branch to that commit.
147
148 Interrupted workflow::
149 +
150 -You can get interrupted by an ungent fix request while you are
151 -still in the middle of a large change. The files in your
150 +Suppose you are interrupted by an urgent fix request while you
151 +are in the middle of a large change. The files in your
152 working tree are not in any shape to be committed yet, but you
153 need to get to the other branch for a quick bugfix.
154 +
@@ -164,8 +164,8 @@ $ git reset --soft HEAD^ ;# go back to WIP state <2>
164 $ git reset <3>
165
166 <1> This commit will get blown away so a throw-away log message is OK.
167 -<2> This removes the 'WIP' commit from the commit history, and makes
168 - your working tree in the state just before you made that snapshot.
167 +<2> This removes the 'WIP' commit from the commit history, and sets
168 + your working tree to the state just before you made that snapshot.
169 <3> After <2>, the index file still has all the WIP changes you
170 committed in <1>. This sets it to the last commit you were
171 basing the WIP changes on.