[PATCH v2 1/5] Documentation/git-reset: reorder modes for soft-mixed-hard progression
- From
Thomas Rast <trast@student.ethz.ch>
- Date
- Jul 18, 2010, 18:23 UTC
- Message-ID
- <e1b0c4024710394a5c9787c95f479a827ba18591.1279477130.git.trast@student.ethz.ch>
- In-Reply-To
- <cover.1279477130.git.trast@student.ethz.ch>
Reorder the documetation so that the soft/mixed/hard modes are in this order. This way they form a natural progression towards changing more of the state.
Signed-off-by: Thomas Rast <trast@student.ethz.ch> --- Documentation/git-reset.txt | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 645f0c1..dbb810d 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -8,7 +8,7 @@ git-reset - Reset current HEAD to the specified state SYNOPSIS -------- [verse] -'git reset' [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>] +'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] [<commit>] 'git reset' [-q] [<commit>] [--] <paths>... 'git reset' --patch [<commit>] [--] [<paths>...] @@ -31,17 +31,17 @@ HEAD. OPTIONS ------- ---mixed:: - Resets the index but not the working tree (i.e., the changed files - are preserved but not marked for commit) and reports what has not - been updated. This is the default action. - --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 "Changes to be committed", as 'git status' would put it. +--mixed:: + Resets the index but not the working tree (i.e., the changed files + are preserved but not marked for commit) and reports what has not + been updated. This is the default action. + --hard:: Matches the working tree and index to that of the tree being switched to. Any changes to tracked files in the working tree
-- 1.7.2.rc3.317.gc287