diff options
| -rw-r--r-- | Documentation/git-stash.txt | 7 | ||||
| -rwxr-xr-x | git-stash.sh | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt index b7d263d650..35888b43c8 100644 --- 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,7 +22,7 @@ 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 @@ -36,7 +36,8 @@ 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:: diff --git a/git-stash.sh b/git-stash.sh index 777d1e1351..16979ab41f 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -137,8 +137,8 @@ apply_stash () { # Main command set case "$1" in -list | '') - test $# -gt 0 && shift +list) + shift if test $# = 0 then set x -n 10 @@ -157,7 +157,7 @@ apply) clear) clear_stash ;; -save) +save | '') save_stash && git-reset --hard ;; *) |