diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-03 22:14:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-03 23:05:34 -0800 |
| commit | d77ee72662a821d66ae218056f0103eb24d8d4b4 (patch) | |
| tree | e22abdbd11735a0669362f934ae723d233c87e2b /git-instaweb.sh | |
| parent | eb8381c88518b10d683a29deea1d43ed671f14ec (diff) | |
| parent | 8d0fc48f27304ac1bc7abf802ec53fe66fedb15a (diff) | |
| download | git-d77ee72662a821d66ae218056f0103eb24d8d4b4.tar.gz | |
Merge branch 'master' into np/dreflog
This is to resolve conflicts early in preparation for possible
inclusion of "reflog on detached HEAD" series by Nico, as having
it in 1.5.0 would really help us remove confusion between
detached and attached states.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-instaweb.sh')
| -rwxr-xr-x | git-instaweb.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-instaweb.sh b/git-instaweb.sh index 80adc8307b..cbc7418e35 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -15,11 +15,11 @@ case "$GIT_DIR" in fqgitdir="$PWD/$GIT_DIR" ;; esac -local="`git repo-config --bool --get instaweb.local`" -httpd="`git repo-config --get instaweb.httpd`" -browser="`git repo-config --get instaweb.browser`" -port=`git repo-config --get instaweb.port` -module_path="`git repo-config --get instaweb.modulepath`" +local="`git config --bool --get instaweb.local`" +httpd="`git config --get instaweb.httpd`" +browser="`git config --get instaweb.browser`" +port=`git config --get instaweb.port` +module_path="`git config --get instaweb.modulepath`" conf=$GIT_DIR/gitweb/httpd.conf |