Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH 2/2] Documentation: Add a usage case of git-reset with path

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:44:14
Subsystem: documentation, the rest · Maintainers: Jonathan Corbet, Linus Torvalds

Possibly related (same subject, not in this thread)

Pieter de Bie [off-list ref] writes:
quoted hunk
@@ -176,6 +176,23 @@ $ git reset                                       <3>
     committed as 'snapshot WIP'.  This updates the index to show your
     WIP files as uncommitted.
 
+Reset a single file in the index::
Yeah, an example and description for this relatively new feature
has been lacking.  Very mucuh appreciated.

By the way, I noticed a leftover from our ancient past.

-- >8 --
[PATCH] Documentation/git-reset:

Since 3368d11 (Remove unnecessary git-rm --cached reference from
status output), the status output marks the "Added but not yet
committed" section as "Changes to be committed".

Signed-off-by: Junio C Hamano <redacted>
---
 Documentation/git-reset.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index a4e0a77..b6bcf4d 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -37,7 +37,7 @@ OPTIONS
 --soft::
 	Does not touch the index file nor the working tree at all, but
 	requires them to be in a good order. This leaves all your changed
-	files "Added but not yet committed", as linkgit:git-status[1] would
+	files "Changes to be committed", as linkgit:git-status[1] would
 	put it.
 
 --hard::
-- 
1.5.4.1.1350.g2b9ee
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help