mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-25 02:44:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor git-reset and git-commit documentation fixes

Browse Source 
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>
This commit is contained in:
J. Bruce Fields 2006-01-21 18:54:11 -05:00 committed by Junio C Hamano
parent 8e76c79f4a
commit 8278ac2f4a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-commit.txt
View File

@ -27,7 +27,7 @@ OPTIONS
-a|--all::
Update all paths in the index file. This flag notices
files that have been modified and deleted, but new files
you have not told about git are not affected.
you have not told git about are not affected.
-c or -C <commit>::
Take existing commit object, and reuse the log message

8
Documentation/git-reset.txt
View File

@ -147,8 +147,8 @@ and resets the tip of the branch to that commit.
Interrupted workflow::
+
You can get interrupted by an ungent fix request while you are
still in the middle of a large change. The files in your
Suppose you are interrupted by an urgent fix request while you
are in the middle of a large change. The files in your
working tree are not in any shape to be committed yet, but you
need to get to the other branch for a quick bugfix.
+
@ -164,8 +164,8 @@ $ git reset --soft HEAD^ ;# go back to WIP state <2>
$ git reset <3>
<1> This commit will get blown away so a throw-away log message is OK.
<2> This removes the 'WIP' commit from the commit history, and makes
your working tree in the state just before you made that snapshot.
<2> This removes the 'WIP' commit from the commit history, and sets
your working tree to the state just before you made that snapshot.
<3> After <2>, the index file still has all the WIP changes you
committed in <1>. This sets it to the last commit you were
basing the WIP changes on.