diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-05-23 05:38:18 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 05:38:18 (GMT) |
commit | c9aac55c4e99302e1e365e480eb52c3da2d7c853 (patch) | |
tree | 2091d68f18dda658a10438e29ce53dad2e838104 | |
parent | 4a3bf32b6c7e5d832e02f30a78ad23dc6ba15dcc (diff) | |
parent | 7213c288187bd9ef1e32e4f86c20c55436f1ae90 (diff) | |
download | git-c9aac55c4e99302e1e365e480eb52c3da2d7c853.zip git-c9aac55c4e99302e1e365e480eb52c3da2d7c853.tar.gz git-c9aac55c4e99302e1e365e480eb52c3da2d7c853.tar.bz2 |
Merge branch 'js/no-pager-shorthand'
"git --no-pager cmd" did not have short-and-sweet single letter
option. Now it does.
* js/no-pager-shorthand:
git: add -P as a short option for --no-pager
-rw-r--r-- | Documentation/git.txt | 3 | ||||
-rw-r--r-- | git.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index 4767860..c662f41 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -11,7 +11,7 @@ SYNOPSIS [verse] 'git' [--version] [--help] [-C <path>] [-c <name>=<value>] [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path] - [-p|--paginate|--no-pager] [--no-replace-objects] [--bare] + [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare] [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>] [--super-prefix=<path>] <command> [<args>] @@ -103,6 +103,7 @@ foo.bar= ...`) sets `foo.bar` to the empty string which `git config configuration options (see the "Configuration Mechanism" section below). +-P:: --no-pager:: Do not pipe Git output into a pager. @@ -25,7 +25,7 @@ struct cmd_struct { const char git_usage_string[] = N_("git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" - " [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n" + " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" " <command> [<args>]"); @@ -99,7 +99,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged) exit(0); } else if (!strcmp(cmd, "-p") || !strcmp(cmd, "--paginate")) { use_pager = 1; - } else if (!strcmp(cmd, "--no-pager")) { + } else if (!strcmp(cmd, "-P") || !strcmp(cmd, "--no-pager")) { use_pager = 0; if (envchanged) *envchanged = 1; |