diff options
| -rwxr-xr-x | git-browse-help.sh | 8 | ||||
| -rwxr-xr-x | git-instaweb.sh | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/git-browse-help.sh b/git-browse-help.sh index 76eff01ba..817b3792c 100755 --- a/git-browse-help.sh +++ b/git-browse-help.sh @@ -70,9 +70,13 @@ do done if test -z "$browser"; then - browser=`git config web.browser` + for opt in "help.browser" "web.browser" + do + browser="`git config $opt`" + test -z "$browser" || break + done if test -n "$browser" && ! valid_tool "$browser"; then - echo >&2 "git config option web.browser set to unknown browser: $browser" + echo >&2 "git config option $opt set to unknown browser: $browser" echo >&2 "Resetting to default..." unset browser fi diff --git a/git-instaweb.sh b/git-instaweb.sh index 8503ae403..42d8d7fc6 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -24,6 +24,7 @@ fqgitdir="$GIT_DIR" local="`git config --bool --get instaweb.local`" httpd="`git config --get instaweb.httpd`" browser="`git config --get instaweb.browser`" +test -z "$browser" && browser="`git config --get web.browser`" port=`git config --get instaweb.port` module_path="`git config --get instaweb.modulepath`" |