Re: override merge.ff = false using --ff-only
Matt McClure 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=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? In general it would be better if any --ff related command line options made us ignore the configured default like merge.ff the user may have in the repository, not just --ff-only vs merge.ff combination, and your "On the other hand" demonstrates that it is the case for --ff from the command line. I do not offhand see why --ff-only should behave differently from that expectation. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: override merge.ff = false using --ff-only
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=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. You might want to read the following messages from thread "git merge behavior" http://article.gmane.org/gmane.comp.version-control.git/218519 http://article.gmane.org/gmane.comp.version-control.git/218755 http://article.gmane.org/gmane.comp.version-control.git/218786 Regards. -- Yann Droneaud OPTEYA -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
override merge.ff = false using --ff-only
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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
