[PATCH 0/2] add support for per branch merge policy

These two patches extends git-merge with the options --ff and --no-ff, and uses the configuration setting branch.<name>.integrationonly to select the default policy per branch (it obviously defaults to --ff), as mentioned in http://article.gmane.org/gmane.comp.version-control.git/41980

This can also be used as a clean solution to the problem related to fast-forward merges between git-svn tracking branches, especially if git-svn could be taught to set integrationonly=true on all relevant branches whenever this setting is undefined.

Diffstat:

 Documentation/config.txt        |    7 +++
 Documentation/git-svn.txt       |   17 ++++++
 Documentation/merge-options.txt |   13 +++++
 git-merge.sh                    |   30 ++++++++++-
 t/t6029-merge-integration.sh    |  108 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 172 insertions(+), 3 deletions(-)