From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Mar 2015 23:01:34 +0000 (-0700)
Subject: Merge branch 'mg/doc-status-color-slot'
X-Git-Tag: v2.4.0-rc0~41
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2a39bdb9a163f9f4ad11599dbeca87445eecb7d8?hp=-c

Merge branch 'mg/doc-status-color-slot'

Documentation fixes.

* mg/doc-status-color-slot:
config,completion: add color.status.unmerged
---

2a39bdb9a163f9f4ad11599dbeca87445eecb7d8
diff --combined Documentation/config.txt
index 1530255567,1779625297..f1bc0f2d8c
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -683,13 -683,14 +683,13 @@@ core.abbrev:
  	for abbreviated object names to stay unique for sufficiently long
  	time.
  
 -add.ignore-errors::
  add.ignoreErrors::
 +add.ignore-errors (deprecated)::
  	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].  Older versions of Git accept only
 -	`add.ignore-errors`, which does not follow the usual naming
 -	convention for configuration variables.  Newer versions of Git
 -	honor `add.ignoreErrors` as well.
 +	option of linkgit:git-add[1].  `add.ignore-errors` is deprecated,
 +	as it does not follow the usual naming convention for configuration
 +	variables.
  
  alias.*::
  	Command aliases for the linkgit:git[1] command wrapper - e.g.
@@@ -956,9 -957,11 +956,11 @@@ color.status.<slot>:
  	`added` or `updated` (files which are added but not committed),
  	`changed` (files which are changed but not added in the index),
  	`untracked` (files which are not tracked by Git),
- 	`branch` (the current branch), or
+ 	`branch` (the current branch),
  	`nobranch` (the color the 'no branch' warning is shown in, defaulting
- 	to red). The values of these variables may be specified as in
+ 	to red), or
+ 	`unmerged` (files which have unmerged changes).
+ 	The values of these variables may be specified as in
  	color.branch.<slot>.
  
  color.ui::
@@@ -1739,13 -1742,6 +1741,13 @@@ log.mailmap:
  	If true, makes linkgit:git-log[1], linkgit:git-show[1], and
  	linkgit:git-whatchanged[1] assume `--use-mailmap`.
  
 +mailinfo.scissors::
 +	If true, makes linkgit:git-mailinfo[1] (and therefore
 +	linkgit:git-am[1]) act by default as if the --scissors option
 +	was provided on the command-line. When active, this features
 +	removes everything from the message body before a scissors
 +	line (i.e. consisting mainly of ">8", "8<" and "-").
 +
  mailmap.file::
  	The location of an augmenting mailmap file. The default
  	mailmap, located in the root of the repository, is loaded
@@@ -1966,7 -1962,7 +1968,7 @@@ pack.useBitmaps:
  	true. You should not generally need to turn this off unless
  	you are debugging pack bitmaps.
  
 -pack.writebitmaps::
 +pack.writebitmaps (deprecated)::
  	This is a deprecated synonym for `repack.writeBitmaps`.
  
  pack.writeBitmapHashCache::
@@@ -2100,11 -2096,6 +2102,11 @@@ rebase.autostash:
  	successful rebase might result in non-trivial conflicts.
  	Defaults to false.
  
 +receive.advertiseatomic::
 +	By default, git-receive-pack will advertise the atomic push
 +	capability to its clients. If you don't want to this capability
 +	to be advertised, set this variable to false.
 +
  receive.autogc::
  	By default, git-receive-pack will run "git-gc --auto" after
  	receiving data from git-push and updating refs.  You can stop
@@@ -2164,15 -2155,11 +2166,15 @@@ receive.denyCurrentBranch:
  	message. Defaults to "refuse".
  +
  Another option is "updateInstead" which will update the working
 -directory (must be clean) if pushing into the current branch. This option is
 +tree if pushing into the current branch.  This option is
  intended for synchronizing working directories when one side is not easily
  accessible via interactive ssh (e.g. a live web site, hence the requirement
  that the working directory be clean). This mode also comes in handy when
  developing inside a VM to test and fix code on different Operating Systems.
 ++
 +By default, "updateInstead" will refuse the push if the working tree or
 +the index have any difference from the HEAD, but the `push-to-checkout`
 +hook can be used to customize this.  See linkgit:githooks[5].
  
  receive.denyNonFastForwards::
  	If set to true, git-receive-pack will deny a ref update which is
@@@ -2312,7 -2299,7 +2314,7 @@@ sendemail.smtpencryption:
  	See linkgit:git-send-email[1] for description.  Note that this
  	setting is not subject to the 'identity' mechanism.
  
 -sendemail.smtpssl::
 +sendemail.smtpssl (deprecated)::
  	Deprecated alias for 'sendemail.smtpencryption = ssl'.
  
  sendemail.smtpsslcertpath::
@@@ -2352,7 -2339,7 +2354,7 @@@ sendemail.validate:
  sendemail.xmailer::
  	See linkgit:git-send-email[1] for description.
  
 -sendemail.signedoffcc::
 +sendemail.signedoffcc (deprecated)::
  	Deprecated alias for 'sendemail.signedoffbycc'.
  
  showbranch.default::
@@@ -2417,16 -2404,12 +2419,16 @@@ status.submodulesummary:
  
  submodule.<name>.path::
  submodule.<name>.url::
 +	The path within this project and URL for a submodule. These
 +	variables are initially populated by 'git submodule init'. See
 +	linkgit:git-submodule[1] and linkgit:gitmodules[5] for
 +	details.
 +
  submodule.<name>.update::
 -	The path within this project, URL, and the updating strategy
 -	for a submodule.  These variables are initially populated
 -	by 'git submodule init'; edit them to override the
 -	URL and other values found in the `.gitmodules` file.  See
 -	linkgit:git-submodule[1] and linkgit:gitmodules[5] for details.
 +	The default update procedure for a submodule. This variable
 +	is populated by `git submodule init` from the
 +	linkgit:gitmodules[5] file. See description of 'update'
 +	command in linkgit:git-submodule[1].
  
  submodule.<name>.branch::
  	The remote branch name for a submodule, used by `git submodule
diff --combined contrib/completion/git-completion.bash
index f5ae5e3a8c,1e8965b828..731c28998f
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -411,9 -411,12 +411,9 @@@ __git_refs_remotes (
  
  __git_remotes ()
  {
 -	local i IFS=$'\n' d="$(__gitdir)"
 +	local d="$(__gitdir)"
  	test -d "$d/remotes" && ls -1 "$d/remotes"
 -	for i in $(git --git-dir="$d" config --get-regexp 'remote\..*\.url' 2>/dev/null); do
 -		i="${i#remote.}"
 -		echo "${i/.url*/}"
 -	done
 +	git --git-dir="$d" remote
  }
  
  __git_list_merge_strategies ()
@@@ -1422,7 -1425,7 +1422,7 @@@ __git_log_gitk_options=
  # Options that go well for log and shortlog (not gitk)
  __git_log_shortlog_options="
  	--author= --committer= --grep=
 -	--all-match
 +	--all-match --invert-grep
  "
  
  __git_log_pretty_formats="oneline short medium full fuller email raw format:"
@@@ -2011,6 -2014,7 +2011,7 @@@ _git_config (
  		color.status.changed
  		color.status.header
  		color.status.nobranch
+ 		color.status.unmerged
  		color.status.untracked
  		color.status.updated
  		color.ui