Skip to content

Commit 5207079

Browse files
Martin Koeglergitster
authored andcommitted
git stash: modernize use of "dashed" git-XXX calls
Replace remaining git-XXX calls with git XXX. Signed-off-by: Martin Koegler <[email protected]> Acked-by: Nanako Shiraishi <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent f693b7e commit 5207079

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

git-stash.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ apply_stash () {
203203
git diff-tree --binary $s^2^..$s^2 | git apply --cached
204204
test $? -ne 0 &&
205205
die 'Conflicts in index. Try without --index.'
206-
unstashed_index_tree=$(git-write-tree) ||
206+
unstashed_index_tree=$(git write-tree) ||
207207
die 'Could not save index tree'
208208
git reset
209209
fi
@@ -219,7 +219,7 @@ apply_stash () {
219219
then
220220
export GIT_MERGE_VERBOSITY=0
221221
fi
222-
if git-merge-recursive $b_tree -- $c_tree $w_tree
222+
if git merge-recursive $b_tree -- $c_tree $w_tree
223223
then
224224
# No conflict
225225
if test -n "$unstashed_index_tree"
@@ -297,7 +297,7 @@ apply_to_branch () {
297297
fi
298298
stash=$2
299299

300-
git-checkout -b $branch $stash^ &&
300+
git checkout -b $branch $stash^ &&
301301
apply_stash --index $stash &&
302302
drop_stash $stash
303303
}

0 commit comments

Comments
 (0)