Junio already sent a similar patch, but I think this is simpler.

Felipe Contreras (3):
  merge: simplify ff-only option
  t: replace pulls with merges
  pull: reject non-ff pulls by default

 Documentation/git-pull.txt             |  1 +
 builtin/merge.c                        | 20 ++++++++++----------
 git-pull.sh                            |  9 ++++++++-
 t/annotate-tests.sh                    |  2 +-
 t/t4200-rerere.sh                      |  2 +-
 t/t5500-fetch-pack.sh                  |  2 +-
 t/t5520-pull.sh                        | 33 +++++++++++++++++++++++++++++++++
 t/t5524-pull-msg.sh                    |  2 +-
 t/t5700-clone-reference.sh             |  4 ++--
 t/t6022-merge-rename.sh                | 20 ++++++++++----------
 t/t6026-merge-attr.sh                  |  2 +-
 t/t6029-merge-subtree.sh               |  4 ++--
 t/t6037-merge-ours-theirs.sh           | 10 +++++-----
 t/t7603-merge-reduce-heads.sh          |  2 +-
 t/t9114-git-svn-dcommit-merge.sh       |  2 +-
 t/t9500-gitweb-standalone-no-errors.sh |  2 +-
 16 files changed, 79 insertions(+), 38 deletions(-)

-- 
1.8.4-337-g7358a66-dirty