git stash: modernize use of "dashed" git-XXX calls
Replace remaining git-XXX calls with git XXX. Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at> Acked-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Martin Koegler committed
Jul 22, 2009 at 07:30 UTC
520707905388e293a482066599a1c181ef32f2f0
1 file changed
+3
-3
git-stash.sh
+3
-3
@@ -203,7 +203,7 @@ apply_stash () {
203
git diff-tree --binary $s^2^..$s^2 | git apply --cached
204
test $? -ne 0 &&
205
die 'Conflicts in index. Try without --index.'
206
- unstashed_index_tree=$(git-write-tree) ||
206
+ unstashed_index_tree=$(git write-tree) ||
207
die 'Could not save index tree'
208
git reset
209
fi
@@ -219,7 +219,7 @@ apply_stash () {
219
then
220
export GIT_MERGE_VERBOSITY=0
221
fi
222
- if git-merge-recursive $b_tree -- $c_tree $w_tree
222
+ if git merge-recursive $b_tree -- $c_tree $w_tree
223
then
224
# No conflict
225
if test -n "$unstashed_index_tree"
@@ -297,7 +297,7 @@ apply_to_branch () {
297
fi
298
stash=$2
299
300
- git-checkout -b $branch $stash^ &&
300
+ git checkout -b $branch $stash^ &&
301
apply_stash --index $stash &&
302
drop_stash $stash
303
}