diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2007-12-15 05:57:28 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-14 21:58:35 -0800 |
| commit | 70087cdbd3671f5929689a9b77f414b8297641c2 (patch) | |
| tree | 4c49563792e479574b67fdde3a8e2e07772d7c77 /git-sh-setup.sh | |
| parent | dfaf75b4698833d820e77e9f42ef93f3b6d3669d (diff) | |
| download | git-70087cdbd3671f5929689a9b77f414b8297641c2.tar.gz | |
git-help: add "help.format" config variable.
This config variable makes it possible to choose the default format
used to display help. This format will be used only if no option
like -a|--all|-i|--info|-m|--man|-w|--web is passed to "git-help".
The following values are possible for this variable:
- "man" --> "man" program is used
- "info" --> "info" program is used
- "web" --> "git-browse-help" is used
By default we still show help using "man".
This patch also adds -m|--man command line option to use "man"
to allow overriding the "help.format" configuration variable.
Note that this patch also revert some recent changes in
"git-browse-help" because they prevented to look for config
variables in the global configuration file.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-sh-setup.sh')
| -rwxr-xr-x | git-sh-setup.sh | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/git-sh-setup.sh b/git-sh-setup.sh index b366761b97..270d559297 100755 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -124,13 +124,8 @@ get_author_ident_from_commit () { # Make sure we are in a valid repository of a vintage we understand, # if we require to be in a git repository. -if test -n "$NONGIT_OK" +if test -z "$NONGIT_OK" then - if git rev-parse --git-dir >/dev/null 2>&1 - then - : ${GIT_DIR=.git} - fi -else if [ -z "$SUBDIRECTORY_OK" ] then : ${GIT_DIR=.git} |