From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Feb 2008 19:54:13 +0000 (-0800)
Subject: Merge branch 'db/host-alias'
X-Git-Tag: v1.5.5-rc0~142
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5372715ed268b190b022a12579767816ea6738ae?hp=-c

Merge branch 'db/host-alias'

* db/host-alias:
url rewriting: take longest and first match
Add support for url aliases in config files
Use ALLOC_GROW in remote.{c,h}
---

5372715ed268b190b022a12579767816ea6738ae
diff --combined Documentation/config.txt
index 0c0bd3b0eb,57b9b99863..8e361a1e77
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -353,10 -353,6 +353,10 @@@ core.whitespace:
    error (enabled by default).
  * `indent-with-non-tab` treats a line that is indented with 8 or more
    space characters as an error (not enabled by default).
 +* `cr-at-eol` treats a carriage-return at the end of line as
 +  part of the line terminator, i.e. with it, `trailing-space`
 +  does not trigger if the character before such a carriage-return
 +  is not a whitespace (not enabled by default).
  
  alias.*::
  	Command aliases for the linkgit:git[1] command wrapper - e.g.
@@@ -493,13 -489,6 +493,13 @@@ color.status.<slot>:
  commit.template::
  	Specify a file to use as the template for new commit messages.
  
 +color.ui::
 +	When set to `always`, always use colors in all git commands which
 +	are capable of colored output. When false (or `never`), never. When
 +	set to `true` or `auto`, use colors only when the output is to the
 +	terminal. When more specific variables of color.* are set, they always
 +	take precedence over this setting. Defaults to false.
 +
  diff.autorefreshindex::
  	When using `git diff` to compare with work tree
  	files, do not consider stat-only change as changed.
@@@ -812,8 -801,6 +812,8 @@@ pack.threads:
  	warning. This is meant to reduce packing time on multiprocessor
  	machines. The required amount of memory for the delta search window
  	is however multiplied by the number of threads.
 +	Specifying 0 will cause git to auto-detect the number of CPU's
 +	and set the number of threads accordingly.
  
  pack.indexVersion::
  	Specify the default pack index version.  Valid values are 1 for
@@@ -899,6 -886,17 +899,17 @@@ tar.umask:
  	archiving user's umask will be used instead.  See umask(2) and
  	linkgit:git-archive[1].
  
+ url.<base>.insteadOf::
+ 	Any URL that starts with this value will be rewritten to
+ 	start, instead, with <base>. In cases where some site serves a
+ 	large number of repositories, and serves them with multiple
+ 	access methods, and some users need to use different access
+ 	methods, this feature allows people to specify any of the
+ 	equivalent URLs and have git automatically rewrite the URL to
+ 	the best alternative for the particular user, even for a
+ 	never-before-seen repository on the site.  When more than one
+ 	insteadOf strings match a given URL, the longest match is used.
+ 
  user.email::
  	Your email address to be recorded in any newly created commits.
  	Can be overridden by the 'GIT_AUTHOR_EMAIL', 'GIT_COMMITTER_EMAIL', and