diff options
| author |  Thomas Rast <trast@student.ethz.ch> | 2010-07-18 20:23:22 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-07-19 08:11:04 -0700 |
| commit | bb59b7fffc84eb4cd6591df5a15adb5eaf7218d7 (patch) | |
| tree | 04989f8976b88d70d713fc735b6e17f9886d11da | |
| parent | Merge branch 'jn/paginate-fix' (diff) | |
| download | tgif-bb59b7fffc84eb4cd6591df5a15adb5eaf7218d7.tar.xz | |
Documentation/git-reset: reorder modes for soft-mixed-hard progression
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | 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 645f0c1748..dbb810d3a1 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 |