diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-06-26 14:09:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-26 14:09:29 -0700 |
| commit | 849b44cdf193908dfe1cadc731fb23019b53a211 (patch) | |
| tree | 06c56c63d2ffb408db7682c44fedc7c49a3f3787 /builtin/commit.c | |
| parent | Sync with 2.13.2 (diff) | |
| parent | glossary: define 'stash entry' (diff) | |
| download | tgif-849b44cdf193908dfe1cadc731fb23019b53a211.tar.xz | |
Merge branch 'lb/status-stash-count'
"git status" learned to optionally give how many stash entries the
user has in its output.
* lb/status-stash-count:
glossary: define 'stash entry'
status: add optional stash count information
stash: update documentation to use 'stash entry'
Diffstat (limited to 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 021070e693..00a01f07c3 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1297,6 +1297,10 @@ static int git_status_config(const char *k, const char *v, void *cb) status_deferred_config.show_branch = git_config_bool(k, v); return 0; } + if (!strcmp(k, "status.showstash")) { + s->show_stash = git_config_bool(k, v); + return 0; + } if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) { s->use_color = git_config_colorbool(k, v); return 0; @@ -1345,6 +1349,8 @@ int cmd_status(int argc, const char **argv, const char *prefix) N_("show status concisely"), STATUS_FORMAT_SHORT), OPT_BOOL('b', "branch", &s.show_branch, N_("show branch information")), + OPT_BOOL(0, "show-stash", &s.show_stash, + N_("show stash information")), { OPTION_CALLBACK, 0, "porcelain", &status_format, N_("version"), N_("machine-readable output"), PARSE_OPT_OPTARG, opt_parse_porcelain }, |