From 48687fd8a1e64e4071777ce69e2ee23cc11f582f Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 22 Apr 2013 17:46:35 +0200 Subject: [PATCH] Doc: fix changed field labels Change-Id: I2a9fa92f80c51c088d855f5fec57aecacbb4bea2 Reviewed-by: Orgad Shaneh --- doc/src/howto/creator-vcs.qdoc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/src/howto/creator-vcs.qdoc b/doc/src/howto/creator-vcs.qdoc index b5ffc9b7ce7..cb117636621 100644 --- a/doc/src/howto/creator-vcs.qdoc +++ b/doc/src/howto/creator-vcs.qdoc @@ -267,9 +267,11 @@ \li \gui Git > \gui {Local Repository} > \gui Reset opens a dialog where you can select the SHA-1 to reset the working directory to. This is useful after applying patches for review, for example. You - can choose between a \gui {Soft Reset} that does not touch the index - file nor the working tree at all and a \gui {Hard Reset} that - discards all changes to tracked files in working tree. + can choose between a \gui Soft reset that does not touch the index + file nor the working tree at all, a \gui Hard reset that discards + all changes to tracked files in working tree, and a \gui Mixed + reset that resets HEAD and the index (nothing remains staged) + without touching the working directory. \endlist