"git-merge": allow fast-forwarding in a stat-dirty tree

[git.git] / git-stash.sh

diff --git a/git-stash.sh b/git-stash.sh
index 92531a2951ea29d3a826ad162e709f8701b14bac..e15c12abc31c1e4d22bb3943d70a65ddf33abb53 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -1,7 +1,13 @@
 #!/bin/sh
 # Copyright (c) 2007, Nanako Shiraishi
 
-USAGE='[  | save | list | show | apply | clear | drop | pop | create ]'
+dashless=$(basename "$0" | sed -e 's/-/ /')
+USAGE="list [<options>]
+   or: $dashless (show | drop | pop ) [<stash>]
+   or: $dashless apply [--index] [<stash>]
+   or: $dashless branch <branchname> [<stash>]
+   or: $dashless [save [--keep-index] [<message>]]
+   or: $dashless clear"
 
 SUBDIRECTORY_OK=Yes
 OPTIONS_SPEC=
@@ -93,7 +99,7 @@ save_stash () {
                shift
        esac
 
-       stash_msg="$1"
+       stash_msg="$*"
 
        if no_changes
        then
@@ -233,6 +239,23 @@ drop_stash () {
        git rev-parse --verify "$ref_stash@{0}" > /dev/null 2>&1 || clear_stash
 }
 
+apply_to_branch () {
+       have_stash || die 'Nothing to apply'
+
+       test -n "$1" || die 'No branch name specified'
+       branch=$1
+
+       if test -z "$2"
+       then
+               set x "$ref_stash@{0}"
+       fi
+       stash=$2
+
+       git-checkout -b $branch $stash^ &&
+       apply_stash --index $stash &&
+       drop_stash $stash
+}
+
 # Main command set
 case "$1" in
 list)
@@ -250,7 +273,7 @@ show)
        ;;
 save)
        shift
-       save_stash "$*"
+       save_stash "$@"
        ;;
 apply)
        shift
@@ -279,6 +302,10 @@ pop)
                drop_stash "$@"
        fi
        ;;
+branch)
+       shift
+       apply_to_branch "$@"
+       ;;
 *)
        if test $# -eq 0
        then