Merge branch 'fg/push-default'
commit2545c089e329d340a9bdec9f725fa737063dd7f6
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 Mar 2009 07:26:25 +0000 (26 00:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Mar 2009 07:26:25 +0000 (26 00:26 -0700)
tree04c86073e04ff56e3037e46aeef947c51d7d608a
parent0b3035fe15bfd1d1f7cfab71819cb2cf4fc40d61
parentb2655cdae953d619d488b69b7d49e4204e5682dc
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
Documentation/RelNotes-1.6.3.txt
Documentation/config.txt
builtin-push.c
cache.h
config.c