summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8e76c79)
raw | patch | inline | side by side (parent: 8e76c79)
author | J. Bruce Fields <bfields@fieldses.org> | |
Sat, 21 Jan 2006 23:54:11 +0000 (18:54 -0500) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sun, 22 Jan 2006 03:11:51 +0000 (19:11 -0800) |
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>
documentation.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-commit.txt | patch | blob | history | |
Documentation/git-reset.txt | patch | blob | history |
index e35984dfc7d5a5287ea8231b25c5c8256fb89011..72f96fcfd53d836a8c62d51540762d48d6649863 100644 (file)
-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
index 315683a6d575bb158ec621d7677ff60bcdbce3eb..b4e737e660ba9532b9e69ffe71b80899097dbd4d 100644 (file)
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.
+
$ 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.