From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 1 Jul 2008 23:22:07 +0000 (-0700)
Subject: Merge branch 'np/pack-default'
X-Git-Tag: v1.6.0-rc0~182
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a08ca90938cf88c138edfd9f747d44ef1acf0c05;p=git.git

Merge branch 'np/pack-default'

* np/pack-default:
  pack.indexversion config option now defaults to 2
  repack.usedeltabaseoffset config option now defaults to "true"
---

a08ca90938cf88c138edfd9f747d44ef1acf0c05
diff --cc Documentation/config.txt
index 6966384ce,e523997e7..561ff645f
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -1004,9 -1004,17 +1012,13 @@@ remotes.<group>:
  	<group>".  See linkgit:git-remote[1].
  
  repack.usedeltabaseoffset::
- 	Allow linkgit:git-repack[1] to create packs that uses
- 	delta-base offset.  Defaults to false.
+ 	By default, linkgit:git-repack[1] creates packs that use
+ 	delta-base offset. If you need to share your repository with
+ 	git older than version 1.4.4, either directly or via a dumb
+ 	protocol such as http, then you need to set this option to
+ 	"false" and repack. Access from old git versions over the
+ 	native protocol are unaffected by this option.
  
 -show.difftree::
 -	The default linkgit:git-diff-tree[1] arguments to be used
 -	for linkgit:git-show[1].
 -
  showbranch.default::
  	The default set of branches for linkgit:git-show-branch[1].
  	See linkgit:git-show-branch[1].