X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-stash.sh;h=03e589f764ba0570559fdb23a9a11cc2a0f24044;hb=6d71c1dca4396de545a6c9667b3dcf0c03e42b30;hp=531c7c31aca87db77e54c46ffb89899652a79fcd;hpb=248b6c0609cf7cc9411a9094c4868ce9cdbd4922;p=git.git

diff --git a/git-stash.sh b/git-stash.sh
index 531c7c31a..03e589f76 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -203,7 +203,7 @@ apply_stash () {
 		git diff-tree --binary $s^2^..$s^2 | git apply --cached
 		test $? -ne 0 &&
 			die 'Conflicts in index. Try without --index.'
-		unstashed_index_tree=$(git-write-tree) ||
+		unstashed_index_tree=$(git write-tree) ||
 			die 'Could not save index tree'
 		git reset
 	fi
@@ -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"
@@ -297,7 +297,7 @@ apply_to_branch () {
 	fi
 	stash=$2
 
-	git-checkout -b $branch $stash^ &&
+	git checkout -b $branch $stash^ &&
 	apply_stash --index $stash &&
 	drop_stash $stash
 }