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

diff --cc Documentation/RelNotes-1.6.3.txt
Simple merge

diff --cc Documentation/config.txt
index 12540b605f4f15e93703bed226ab43c0b8d6716b,7b2b3f44aa5cbd1cf5c17fb7976a1e29d11c8c90..750675530cf4a15137e837c9d15acb8f23ae7cd3
--- 1/Documentation/config.txt
--- 2/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

diff --cc builtin-push.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc config.c
Simple merge