I naively tried to override merge.ff = false using --ff-only on the
command line. I expected that it would override the configured default
and perform a fast-forward merge. Instead, it said:
$ git config -l | grep -F 'merge.ff'
merge.ff=false
$ git merge --ff-only foo
fatal: You cannot combine --no-ff with --ff-only.
On the other hand, I see that --ff works just fine in the same initial state.
$ git merge --ff foo
Updating b869407..17b5495
Fast-forward
...
4 files changed, 2 insertions(+), 5 deletions(-)
Would it be better if --ff-only refused to merge only if the commits
themselves prevented fast-forwarding?
--
Matt McClure
http://matthewlmcclure.com
http://www.mapmyfitness.com/profile/matthewlmcclure
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html