diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-06 14:24:32 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-06 14:24:32 +0900 |
| commit | 40f1293530427c315072df3f65a822e621ffe2ae (patch) | |
| tree | 93da6f907f2e892846a5ca54f5a7e987652c9978 /git-stash.sh | |
| parent | 30af513004af513206bf52f4a11c40205d868500 (diff) | |
| parent | c0c0c825ce19963ded30919778a23c3c85662755 (diff) | |
| download | git-40f1293530427c315072df3f65a822e621ffe2ae.tar.gz git-40f1293530427c315072df3f65a822e621ffe2ae.tar.xz | |
Merge branch 'tg/deprecate-stash-save'
"git stash save" has been deprecated in favour of "git stash push".
* tg/deprecate-stash-save:
stash: remove now superfluos help for "stash push"
stash: mark "git stash save" deprecated in the man page
stash: replace "git stash save" with "git stash push" in the documentation
Diffstat (limited to 'git-stash.sh')
| -rwxr-xr-x | git-stash.sh | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/git-stash.sh b/git-stash.sh index 8b2ce9afd..4b7495144 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -260,18 +260,7 @@ push_stash () { ;; -*) option="$1" - # TRANSLATORS: $option is an invalid option, like - # `--blah-blah'. The 7 spaces at the beginning of the - # second line correspond to "error: ". So you should line - # up the second line with however many characters the - # translation of "error: " takes in your language. E.g. in - # English this is: - # - # $ git stash save --blah-blah 2>&1 | head -n 2 - # error: unknown option for 'stash save': --blah-blah - # To provide a message, use git stash save -- '--blah-blah' - eval_gettextln "error: unknown option for 'stash save': \$option - To provide a message, use git stash save -- '\$option'" + eval_gettextln "error: unknown option for 'stash push': \$option" usage ;; *) |