tree 26bfe8765b77b05e2d09653d433ffc6789ee3d4e
parent d08af0ad745869a4fe36bc8df4f9804edfb74eb9
author Lars Hjemli <hjemli@gmail.com> 1190587905 +0200
committer Junio C Hamano <gitster@pobox.com> 1190592843 -0700

git-merge: add --ff and --no-ff options

These new options can be used to control the policy for fast-forward
merges: --ff allows it (this is the default) while --no-ff will create
a merge commit.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>