File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -203,7 +203,7 @@ apply_stash () {
203
203
git diff-tree --binary $s ^2^..$s ^2 | git apply --cached
204
204
test $? -ne 0 &&
205
205
die ' Conflicts in index. Try without --index.'
206
- unstashed_index_tree=$( git- write-tree) ||
206
+ unstashed_index_tree=$( git write-tree) ||
207
207
die ' Could not save index tree'
208
208
git reset
209
209
fi
@@ -219,7 +219,7 @@ apply_stash () {
219
219
then
220
220
export GIT_MERGE_VERBOSITY=0
221
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
223
then
224
224
# No conflict
225
225
if test -n " $unstashed_index_tree "
@@ -297,7 +297,7 @@ apply_to_branch () {
297
297
fi
298
298
stash=$2
299
299
300
- git- checkout -b $branch $stash ^ &&
300
+ git checkout -b $branch $stash ^ &&
301
301
apply_stash --index $stash &&
302
302
drop_stash $stash
303
303
}
You can’t perform that action at this time.
0 commit comments