Skip to content

Commit

Permalink
git-stash: make "save" the default action again.
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
gitster committed Jul 3, 2007
1 parent 5be6007 commit fcb10a9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
7 changes: 4 additions & 3 deletions Documentation/git-stash.txt
Expand Up @@ -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.
Expand All @@ -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
Expand All @@ -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::

Expand Down
6 changes: 3 additions & 3 deletions git-stash.sh
Expand Up @@ -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
Expand All @@ -157,7 +157,7 @@ apply)
clear)
clear_stash
;;
save)
save | '')
save_stash && git-reset --hard
;;
*)
Expand Down

0 comments on commit fcb10a9

Please sign in to comment.