* [PATCH] doc: git-reset: clarify the --keep usage example
@ 2017-06-14 9:35 Štěpán Němec
0 siblings, 0 replies; only message in thread
From: Štěpán Němec @ 2017-06-14 9:35 UTC (permalink / raw)
To: git; +Cc: gitster, christian.couder
The example doesn't work as provided (you get an error) when the 'edit'
and 'commit' steps affect the same files.
Add a note and reference the DISCUSSION to that effect.
Signed-off-by: Štěpán Němec <stepnem@gmail.com>
---
Documentation/git-reset.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 70f3753..727ba46 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -290,7 +290,8 @@ $ git reset --keep start <3>
to branch2 (i.e. "git checkout -b branch2 start"), but nobody is
perfect.
<3> But you can use "reset --keep" to remove the unwanted commit after
- you switched to "branch2".
+ you switched to "branch2" (as long as the commit doesn't conflict with your
+ working tree changes, see the "DISCUSSION" below for more details).
Split a commit apart into a sequence of commits::
+
--
2.1.4
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-06-14 9:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-14 9:35 [PATCH] doc: git-reset: clarify the --keep usage example Štěpán Němec
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).