[PATCH 0/6] Preparation for non-ff pulls by default

It is very typical for Git newcomers to inadvertently create merges and worst: inadvertently pushing them. This is one of the reasons many experienced users prefer to avoid 'git pull', and recommend newcomers to avoid it as well.

To avoid these problems and keep 'git pull' useful, it has been suggested that 'git pull' barfs by default if the merge is non-fast-forward, which unfortunately would break backwards compatibility.

This patch series leaves everything in place to enable this new mode, but it only gets enabled if the user specifically configures it; pull.mode = merge-ff-only.

Later on this mode can be enabled by default (e.g. in v2.0).

To achieve that first some configurations are renamed: for example: pull.rebase => pull.mode = rebase, but the old ones remain functional, thus there are no functional changes.

Felipe Contreras (6):
  merge: simplify ff-only option
  t: replace pulls with merges
  pull: rename pull.rename to pull.mode
  pull: refactor $rebase variable into $mode
  pull: add --merge option
  pull: add merge-ff-only option

 Documentation/config.txt               | 24 +++++++------
 Documentation/git-pull.txt             | 10 ++++--
 branch.c                               |  4 +--
 builtin/merge.c                        | 20 +++++------
 git-pull.sh                            | 49 ++++++++++++++++++++-------
 t/annotate-tests.sh                    |  2 +-
 t/t3200-branch.sh                      | 40 +++++++++++-----------
 t/t4200-rerere.sh                      |  2 +-
 t/t5520-pull.sh                        | 62 ++++++++++++++++++++++++++++++++++
 t/t5601-clone.sh                       |  4 +--
 t/t9114-git-svn-dcommit-merge.sh       |  2 +-
 t/t9500-gitweb-standalone-no-errors.sh |  2 +-
 12 files changed, 157 insertions(+), 64 deletions(-)