summaryrefslogtreecommitdiff
path: root/gitweb
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-01 17:09:08 -0700
committerJunio C Hamano <gitster@pobox.com>2007-11-01 17:09:08 -0700
commit3e4bb087a18435b12eb82116e93af2887578e816 (patch)
tree8d6a07552a4f841bfe5d9f23dd68ce39951f5966 /gitweb
parent5fb19486e6f4b6d31f33f5a1eab970b244fa2d08 (diff)
parent136e6316705e9e83cbb09c2a9ac4cb29c3e4662d (diff)
downloadgit-3e4bb087a18435b12eb82116e93af2887578e816.tar.gz
Merge branch 'maint'
* maint: git-format-patch.txt: fix explanation of an example. git-filter-branch.txt: fix a typo. git-clone.txt: Improve --depth description. gitweb: Update config file example for snapshot feature in gitweb/INSTALL
Diffstat (limited to 'gitweb')
-rw-r--r--gitweb/INSTALL2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitweb/INSTALL b/gitweb/INSTALL
index 6328e26f56..9cd5b0a2b1 100644
--- a/gitweb/INSTALL
+++ b/gitweb/INSTALL
@@ -116,7 +116,7 @@ GITWEB_CONFIG file:
$feature{'pickaxe'}{'default'} = [1];
$feature{'pickaxe'}{'override'} = 1;
- $feature{'snapshot'}{'default'} = ['x-gzip', 'gz', 'gzip'];
+ $feature{'snapshot'}{'default'} = ['zip', 'tgz'];
$feature{'snapshot'}{'override'} = 1;