From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Jul 2009 17:42:23 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.4-rc0~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/26192bee8e632e27d361d0d67a6e2a544fb1489b?ds=inline;hp=-c

Merge branch 'maint'

* maint:
Documentation: update description of shell aliases
---

26192bee8e632e27d361d0d67a6e2a544fb1489b
diff --combined Documentation/config.txt
index 2fecbe32a6,c06eca43d7..bf97e1dee2
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -438,11 -438,6 +438,11 @@@ On some file system/operating system co
  Set this config setting to 'rename' there; However, This will remove the
  check that makes sure that existing object files will not get overwritten.
  
 +add.ignore-errors::
 +	Tells 'git-add' to continue adding files when some files cannot be
 +	added due to indexing errors. Equivalent to the '--ignore-errors'
 +	option of linkgit:git-add[1].
 +
  alias.*::
  	Command aliases for the linkgit:git[1] command wrapper - e.g.
  	after defining "alias.last = cat-file commit HEAD", the invocation
@@@ -456,7 -451,9 +456,9 @@@ If the alias expansion is prefixed wit
  it will be treated as a shell command.  For example, defining
  "alias.new = !gitk --all --not ORIG_HEAD", the invocation
  "git new" is equivalent to running the shell command
- "gitk --all --not ORIG_HEAD".
+ "gitk --all --not ORIG_HEAD".  Note that shell commands will be
+ executed from the top-level directory of a repository, which may
+ not necessarily be the current directory.
  
  apply.whitespace::
  	Tells 'git-apply' how to handle whitespaces, in the same way
@@@ -609,12 -606,6 +611,12 @@@ color.pager:
  	A boolean to enable/disable colored output when the pager is in
  	use (default is true).
  
 +color.showbranch::
 +	A boolean to enable/disable color in the output of
 +	linkgit:git-show-branch[1]. May be set to `always`,
 +	`false` (or `never`) or `auto` (or `true`), in which case colors are used
 +	only when the output is to a terminal. Defaults to false.
 +
  color.status::
  	A boolean to enable/disable color in the output of
  	linkgit:git-status[1]. May be set to `always`,
@@@ -1319,9 -1310,6 +1321,9 @@@ remote.<name>.url:
  	The URL of a remote repository.  See linkgit:git-fetch[1] or
  	linkgit:git-push[1].
  
 +remote.<name>.pushurl::
 +	The push URL of a remote repository.  See linkgit:git-push[1].
 +
  remote.<name>.proxy::
  	For remotes that require curl (http, https and ftp), the URL to
  	the proxy to use for that remote.  Set to the empty string to