[PATCHv2 0/4] push.default and branch.<name>.{remote,merge} changes

Hi *,

  the four patches are conceptually independent, but they have textual
dependency.

  The 1st one can also be applied to 'maint'.

Changes from v1:
  rename "tracking branch" to "upstream branch"
  rename push.default to push.mode instead of push.style

Santi Béjar (4):
  Documentation: enhance branch.<name>.{remote,merge}
  Documentation: push.default applies to all remotes
  Documentation: branch.*.merge can also afect 'git-push'
  Rename push.default to push.mode

 Documentation/RelNotes-1.6.3.txt |    2 +-
 Documentation/config.txt         |   21 ++++++++++-----------
 builtin-push.c                   |   16 ++++++++--------
 cache.h                          |   14 +++++++-------
 config.c                         |   10 +++++-----
 environment.c                    |    2 +-
 6 files changed, 32 insertions(+), 33 deletions(-)