{"thread":{"id":"33900","subject":"override merge.ff = false using --ff-only","startedAt":"2013-05-22T13:21:23Z","lastAt":"2013-05-22T18:12:01Z","messageCount":3,"participants":["Matt McClure","Yann Droneaud","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"218170","messageId":"CAJELnLFqzVBd57vudsCFrTNMVxETO75GT5T5NO0sDMtgHZJU6g@mail.gmail.com","threadId":"33900","inReplyTo":"CAJELnLEGCshD9z9get62+T6Z83OdPJ+A5BNSzsHA1_OC1Q00Hw@mail.gmail.com","subject":"override merge.ff = false using --ff-only","fromName":"Matt McClure","fromEmail":"matthewlmcclure@gmail.com","sentAt":"2013-05-22T13:21:23Z","receivedAt":"2013-05-22T13:21:23Z","isPatch":false,"sender":{"key":"matthewlmcclure@gmail.com","avatar":"https://gravatar.com/avatar/a8cde96b0594204c8d4c48baa51c983af37dedfa2b7a846e27547b8d63d46e7c?d=mp&s=160"},"body":"I naively tried to override merge.ff = false using --ff-only on the\ncommand line. I expected that it would override the configured default\nand perform a fast-forward merge. Instead, it said:\n\n    $ git config -l | grep -F 'merge.ff'\n    merge.ff=false\n\n    $ git merge --ff-only foo\n    fatal: You cannot combine --no-ff with --ff-only.\n\nOn the other hand, I see that --ff works just fine in the same initial state.\n\n    $ git merge --ff foo\n    Updating b869407..17b5495\n    Fast-forward\n    ...\n     4 files changed, 2 insertions(+), 5 deletions(-)\n\nWould it be better if --ff-only refused to merge only if the commits\nthemselves prevented fast-forwarding?\n\n--\nMatt McClure\nhttp://matthewlmcclure.com\nhttp://www.mapmyfitness.com/profile/matthewlmcclure\n"},{"id":"218176","messageId":"428ac6eff0b1a118a9b09f0835ab65b5@meuh.org","threadId":"33900","inReplyTo":"CAJELnLFqzVBd57vudsCFrTNMVxETO75GT5T5NO0sDMtgHZJU6g@mail.gmail.com","subject":"Re: override merge.ff = false using --ff-only","fromName":"Yann Droneaud","fromEmail":"ydroneaud@opteya.com","sentAt":"2013-05-22T13:36:50Z","receivedAt":"2013-05-22T13:36:50Z","isPatch":false,"sender":{"key":"ydroneaud@opteya.com","avatar":"https://avatars.githubusercontent.com/u/881377?v=4"},"body":"Hi,\n\nLe 22.05.2013 15:21, Matt McClure a écrit :\n> I naively tried to override merge.ff = false using --ff-only on the\n> command line. I expected that it would override the configured \n> default\n> and perform a fast-forward merge. Instead, it said:\n>\n>     $ git config -l | grep -F 'merge.ff'\n>     merge.ff=false\n>\n>     $ git merge --ff-only foo\n>     fatal: You cannot combine --no-ff with --ff-only.\n>\n> On the other hand, I see that --ff works just fine in the same \n> initial state.\n>\n\nYou might want to read the following messages from thread \"git merge \n<tag> behavior\"\n\nhttp://article.gmane.org/gmane.comp.version-control.git/218519\nhttp://article.gmane.org/gmane.comp.version-control.git/218755\nhttp://article.gmane.org/gmane.comp.version-control.git/218786\n\n\nRegards.\n\n-- \nYann Droneaud\nOPTEYA\n"},{"id":"218200","messageId":"7vzjvmj34e.fsf@alter.siamese.dyndns.org","threadId":"33900","inReplyTo":"CAJELnLFqzVBd57vudsCFrTNMVxETO75GT5T5NO0sDMtgHZJU6g@mail.gmail.com","subject":"Re: override merge.ff = false using --ff-only","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-05-22T18:12:01Z","receivedAt":"2013-05-22T18:12:01Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matt McClure <matthewlmcclure@gmail.com> writes:\n\n> I naively tried to override merge.ff = false using --ff-only on the\n> command line. I expected that it would override the configured default\n> and perform a fast-forward merge. Instead, it said:\n>\n>     $ git config -l | grep -F 'merge.ff'\n>     merge.ff=false\n>\n>     $ git merge --ff-only foo\n>     fatal: You cannot combine --no-ff with --ff-only.\n>\n> On the other hand, I see that --ff works just fine in the same initial state.\n>\n>     $ git merge --ff foo\n>     Updating b869407..17b5495\n>     Fast-forward\n>     ...\n>      4 files changed, 2 insertions(+), 5 deletions(-)\n>\n> Would it be better if --ff-only refused to merge only if the commits\n> themselves prevented fast-forwarding?\n\nIn general it would be better if any --ff related command line\noptions made us ignore the configured default like merge.ff the user\nmay have in the repository, not just --ff-only vs merge.ff\ncombination, and your \"On the other hand\" demonstrates that it is\nthe case for --ff from the command line.\n\nI do not offhand see why --ff-only should behave differently from\nthat expectation.\n"}]}