[PATCH] RESUBMIT: replace reference to git-rm with git-reset in git-commit doc
- From
- Jing Xue <jingxue@digizenstudio.com>
- Date
- Nov 12, 2007, 04:43 UTC
- Message-ID
- <20071112044300.GB7595@fawkes>
- In-Reply-To
- <7vsl3c8afm.fsf@gitster.siamese.dyndns.org>
On Sun, Nov 11, 2007 at 06:27:57PM -0800, Junio C Hamano wrote:
> > I think "changes ... can be removed" risks to give a confused > mental model that somehow git tracks changes.
I see what you mean. "Changes" shouldn't be the subject here.
> "A file can be > reverted back to that of the last commit with ..." would be > less risky.
On top of that, I somehow still want to make it relevant to that git-reset instead of git-rm should be used to revert git-add. So how about this?
Signed-off-by: Jing Xue <jingxue@digizenstudio.com> --- Documentation/git-add.txt | 1 + Documentation/git-commit.txt | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 963e1ab..63829d9 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -224,6 +224,7 @@ See Also -------- gitlink:git-status[1] gitlink:git-rm[1] +gitlink:git-reset[1] gitlink:git-mv[1] gitlink:git-commit[1] gitlink:git-update-index[1] diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index e54fb12..4b26cae 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -154,11 +154,14 @@ EXAMPLES -------- When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area -called the "index" with gitlink:git-add[1]. Removal -of a file is staged with gitlink:git-rm[1]. After building the -state to be committed incrementally with these commands, `git -commit` (without any pathname parameter) is used to record what -has been staged so far. This is the most basic form of the +called the "index" with gitlink:git-add[1]. A file can be +reverted back, only in the index but not in the working tree, +to that of the last commit with `git-reset HEAD -- <file>`, +which effectively reverts `git-add` and prevents this file from +participating in the next commit. After building the state to +be committed incrementally with these commands, `git commit` +(without any pathname parameter) is used to record what has +been staged so far. This is the most basic form of the command. An example: ------------