From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Mar 2009 07:26:25 +0000 (-0700)
Subject: Merge branch 'fg/push-default'
X-Git-Tag: v1.6.3-rc0~87
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2545c089e329d340a9bdec9f725fa737063dd7f6;p=git.git

Merge branch 'fg/push-default'

* fg/push-default:
  builtin-push.c: Fix typo: "anythig" -> "anything"
  Display warning for default git push with no push.default config
  New config push.default to decide default behavior for push

Conflicts:
	Documentation/config.txt
---

2545c089e329d340a9bdec9f725fa737063dd7f6
diff --cc Documentation/config.txt
index 12540b605,7b2b3f44a..750675530
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -1194,10 -1160,24 +1194,28 @@@ pull.octopus:
  pull.twohead::
  	The default merge strategy to use when pulling a single branch.
  
+ push.default::
+ 	Defines the action git push should take if no refspec is given
+ 	on the command line, no refspec is configured in the remote, and
+ 	no refspec is implied by any of the options given on the command
+ 	line.
+ +
+ The term `current remote` means the remote configured for the current
+ branch, or `origin` if no remote is configured. `origin` is also used
+ if you are not on any branch. Possible values are:
+ +
+ * `nothing` do not push anything.
+ * `matching` push all matching branches to the current remote.
+   All branches having the same name in both ends are considered to be
+   matching. This is the current default value.
+ * `tracking` push the current branch to the branch it is tracking.
+ * `current` push the current branch to a branch of the same name on the
+   current remote.
+ 
 +rebase.stat::
 +	Whether to show a diffstat of what changed upstream since the last
 +	rebase. False by default.
 +
  receive.fsckObjects::
  	If it is set to true, git-receive-pack will check all received
  	objects. It will abort in the case of a malformed object or a