diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-01-10 11:52:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-10 11:52:52 -0800 |
| commit | 8ab404ea0463c99fc85095e0419ed08a1486ae92 (patch) | |
| tree | a323091a34ddc5c150127d2a8781c51ebdb747e5 /builtin/stash.c | |
| parent | 077e120a1ef689d1f26b2ce854438e50f1240c9b (diff) | |
| parent | ca7990cea5a1bae665c07587be00b51fa652a9a9 (diff) | |
| download | git-8ab404ea0463c99fc85095e0419ed08a1486ae92.tar.gz | |
Merge branch 'ab/do-not-limit-stash-help-to-push'
"git stash" by default triggers its "push" action, but its
implementation also made "git stash -h" to show short help only for
"git stash push", which has been corrected.
* ab/do-not-limit-stash-help-to-push:
stash: don't show "git stash push" usage on bad "git stash" usage
Diffstat (limited to 'builtin/stash.c')
| -rw-r--r-- | builtin/stash.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/stash.c b/builtin/stash.c index fb1e466e5d..6da736d718 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -1683,6 +1683,7 @@ static int push_stash(int argc, const char **argv, const char *prefix, if (argc) { force_assume = !strcmp(argv[0], "-p"); argc = parse_options(argc, argv, prefix, options, + push_assumed ? git_stash_usage : git_stash_push_usage, PARSE_OPT_KEEP_DASHDASH); } |