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
Hi,
Le 22.05.2013 15:21, Matt McClure a écrit :
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
Matt McClure matthewlmccl...@gmail.com writes:
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
3 matches
Mail list logo