diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 11:02:56 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 11:02:56 +0300 |
| commit | 036e1274a2e230462ce7b201de760bb12260a516 (patch) | |
| tree | 13a6ab085b6eb5888624a2bba7a140939280aaab /git-stash.sh | |
| parent | 1eb539a9b3ed2af95992bf9460bd77b4bc5fea23 (diff) | |
| parent | 974ce8078c9a91190d798eaa65c9f173dd50c3f8 (diff) | |
Merge branch 'mf/no-dashed-subcommands' into maint
Code clean-up.
* mf/no-dashed-subcommands:
scripts: use "git foo" not "git-foo"
Diffstat (limited to 'git-stash.sh')
| -rwxr-xr-x | git-stash.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-stash.sh b/git-stash.sh index 5f09a47f0a..328cd80d83 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -580,7 +580,7 @@ apply_stash () { if test -n "$u_tree" then - GIT_INDEX_FILE="$TMPindex" git-read-tree "$u_tree" && + GIT_INDEX_FILE="$TMPindex" git read-tree "$u_tree" && GIT_INDEX_FILE="$TMPindex" git checkout-index --all && rm -f "$TMPindex" || die "$(gettext "Could not restore untracked files from stash entry")" |