From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 6 Jan 2013 07:42:11 +0000 (-0800)
Subject: Merge branch 'wk/submodule-update-remote'
X-Git-Tag: v1.8.2-rc0~177
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/902f2f4f0a0bcc6c8d63ad4cd6b75b7eb9d65a72?ds=inline;hp=-c

Merge branch 'wk/submodule-update-remote'

The beginning of 'integrate with the tip of the remote branch, not
the commit recorded in the superproject gitlink' support.

* wk/submodule-update-remote:
submodule add: If --branch is given, record it in .gitmodules
submodule update: add --remote for submodule's upstream changes
submodule: add get_submodule_config helper funtion
---

902f2f4f0a0bcc6c8d63ad4cd6b75b7eb9d65a72
diff --combined Documentation/config.txt
index 0e206759fd,3a44fd78ab..53c4ca1d7a
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -140,11 -140,10 +140,11 @@@ advice.*:
  	can tell Git that you do not need help by setting these to 'false':
  +
  --
 -	pushNonFastForward::
 +	pushUpdateRejected::
  		Set this variable to 'false' if you want to disable
 -		'pushNonFFCurrent', 'pushNonFFDefault', and
 -		'pushNonFFMatching' simultaneously.
 +		'pushNonFFCurrent', 'pushNonFFDefault',
 +		'pushNonFFMatching', and 'pushAlreadyExists'
 +		simultaneously.
  	pushNonFFCurrent::
  		Advice shown when linkgit:git-push[1] fails due to a
  		non-fast-forward update to the current branch.
@@@ -159,15 -158,11 +159,15 @@@
  		'matching refs' explicitly (i.e. you used ':', or
  		specified a refspec that isn't your current branch) and
  		it resulted in a non-fast-forward error.
 +	pushAlreadyExists::
 +		Shown when linkgit:git-push[1] rejects an update that
 +		does not qualify for fast-forwarding (e.g., a tag.)
  	statusHints::
  		Show directions on how to proceed from the current
 -		state in the output of linkgit:git-status[1] and in
 +		state in the output of linkgit:git-status[1], in
  		the template shown when writing commit messages in
 -		linkgit:git-commit[1].
 +		linkgit:git-commit[1], and in the help message shown
 +		by linkgit:git-checkout[1] when switching branch.
  	commitBeforeMerge::
  		Advice shown when linkgit:git-merge[1] refuses to
  		merge to avoid overwriting local changes.
@@@ -1521,14 -1516,6 +1521,14 @@@ mailmap.file:
  	subdirectory, or somewhere outside of the repository itself.
  	See linkgit:git-shortlog[1] and linkgit:git-blame[1].
  
 +mailmap.blob::
 +	Like `mailmap.file`, but consider the value as a reference to a
 +	blob in the repository. If both `mailmap.file` and
 +	`mailmap.blob` are given, both are parsed, with entries from
 +	`mailmap.file` taking precedence. In a bare repository, this
 +	defaults to `HEAD:.mailmap`. In a non-bare repository, it
 +	defaults to empty.
 +
  man.viewer::
  	Specify the programs that may be used to display help in the
  	'man' format. See linkgit:git-help[1].
@@@ -2007,6 -1994,12 +2007,12 @@@ submodule.<name>.update:
  	URL and other values found in the `.gitmodules` file.  See
  	linkgit:git-submodule[1] and linkgit:gitmodules[5] for details.
  
+ submodule.<name>.branch::
+ 	The remote branch name for a submodule, used by `git submodule
+ 	update --remote`.  Set this option to override the value found in
+ 	the `.gitmodules` file.  See linkgit:git-submodule[1] and
+ 	linkgit:gitmodules[5] for details.
+ 
  submodule.<name>.fetchRecurseSubmodules::
  	This option can be used to control recursive fetching of this
  	submodule. It can be overridden by using the --[no-]recurse-submodules