Merge branch 'maint'

[git.git] / Documentation / git-stash.txt

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 4dc344dfe7a1e4bc242aa7496bebc1f475587014..ad95ed9ce149d3db23ba9c36aa7a661e37977cc6 100644 (file)
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -13,7 +13,7 @@ SYNOPSIS
 DESCRIPTION
 -----------
 
-Use 'git-stash save' when you want to record the current state of the
+Use 'git-stash' when you want to record the current state of the
 working directory and the index, but want to go back to a clean
 working directory.  The command saves your local modifications away
 and reverts the working directory to match the `HEAD` commit.
@@ -22,12 +22,12 @@ The modifications stashed away by this command can be listed with
 `git-stash list`, inspected with `git-stash show`, and restored
 (potentially on top of a different commit) with `git-stash apply`.
 Calling git-stash without any arguments is equivalent to `git-stash
-list`.
+save`.
 
 The latest stash you created is stored in `$GIT_DIR/refs/stash`; older
 stashes are found in the reflog of this reference and can be named using
-the usual reflog syntax (e.g. `stash@{1}` is the most recently
-created stash, `stash@{2}` is the one before it, `stash@{2.hours.ago}`
+the usual reflog syntax (e.g. `stash@\{1}` is the most recently
+created stash, `stash@\{2}` is the one before it, `stash@\{2.hours.ago}`
 is also possible).
 
 OPTIONS
@@ -36,12 +36,13 @@ OPTIONS
 save::
 
        Save your local modifications to a new 'stash', and run `git-reset
-       --hard` to revert them.
+       --hard` to revert them.  This is the default action when no
+       subcommand is given.
 
 list::
 
        List the stashes that you currently have.  Each 'stash' is listed
-       with its name (e.g. `stash@{0}` is the latest stash, `stash@{1} is
+       with its name (e.g. `stash@\{0}` is the latest stash, `stash@\{1} is
        the one before, etc.), the name of the branch that was current when the
        stash was made, and a short description of the commit the stash was
        based on.
@@ -57,7 +58,7 @@ show [<stash>]::
        stashed state and its original parent. When no `<stash>` is given,
        shows the latest one. By default, the command shows the diffstat, but
        it will accept any format known to `git-diff` (e.g., `git-stash show
-       -p stash@{2}` to view the second most recent stash in patch form).
+       -p stash@\{2}` to view the second most recent stash in patch form).
 
 apply [<stash>]::
 
@@ -84,7 +85,7 @@ the `HEAD` commit.  The ancestry graph looks like this:
 
             .----W
            /    /
-     ...--H----I
+     -----H----I
 
 where `H` is the `HEAD` commit, `I` is a commit that records the state
 of the index, and `W` is a commit that records the state of the working