From: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Date: Tue, 21 Jul 2009 20:06:16 GMT
Subject: [PATCH 1/2] Fix git stash apply
Message-ID: <1248206777-6984-1-git-send-email-mkoegler@auto.tuwien.ac.at>

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
---
 git-stash.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-stash.sh b/git-stash.sh
index 531c7c3..5b4b4e6 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -219,7 +219,7 @@ apply_stash () {
 	then
 		export GIT_MERGE_VERBOSITY=0
 	fi
-	if git-merge-recursive $b_tree -- $c_tree $w_tree
+	if git merge-recursive $b_tree -- $c_tree $w_tree
 	then
 		# No conflict
 		if test -n "$unstashed_index_tree"
-- 
1.5.6.5