{"thread":{"id":"28750","subject":"git mergetool ignores configured command line","startedAt":"2011-10-23T04:43:26Z","lastAt":"2011-10-23T10:35:01Z","messageCount":4,"participants":["Alexander Vladimirov","Andreas Schwab","Junio C Hamano","David Aguilar"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"178186","messageId":"CAARCrw6D7CKy2Jn43zUZ3EefyqdY6Tk4A39ZQ74H6hySA5eCBQ@mail.gmail.com","threadId":"28750","inReplyTo":null,"subject":"git mergetool ignores configured command line","fromName":"Alexander Vladimirov","fromEmail":"alexander.idkfa.vladimirov@gmail.com","sentAt":"2011-10-23T04:43:26Z","receivedAt":"2011-10-23T04:43:26Z","isPatch":false,"sender":{"key":"alexander.idkfa.vladimirov@gmail.com","avatar":null},"body":"To configure diffuse as merge tool I set mergetool configuration using\nfollowing commands:\n\ngit config --global merge.tool diffuse\ngit config --global mergetool.diffuse.cmd '/usr/bin/diffuse \"$LOCAL\"\n\"$MERGED\" \"$REMOTE\"'\n\nThen, when I invoke mergetool during merge, I get diffuse with four\npanes open as by default, instead of three specified in command line\nsetting.\nIs this an expected behavior, and how can I force mergetool to use\nprovided command line?\n"},{"id":"178191","messageId":"m21uu4hzmq.fsf@linux-m68k.org","threadId":"28750","inReplyTo":"CAARCrw6D7CKy2Jn43zUZ3EefyqdY6Tk4A39ZQ74H6hySA5eCBQ@mail.gmail.com","subject":"Re: git mergetool ignores configured command line","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2011-10-23T08:37:49Z","receivedAt":"2011-10-23T08:37:49Z","isPatch":false,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"Alexander Vladimirov <alexander.idkfa.vladimirov@gmail.com> writes:\n\n> To configure diffuse as merge tool I set mergetool configuration using\n> following commands:\n>\n> git config --global merge.tool diffuse\n> git config --global mergetool.diffuse.cmd '/usr/bin/diffuse \"$LOCAL\"\n> \"$MERGED\" \"$REMOTE\"'\n>\n> Then, when I invoke mergetool during merge, I get diffuse with four\n> panes open as by default, instead of three specified in command line\n> setting.\n> Is this an expected behavior, and how can I force mergetool to use\n> provided command line?\n\ndiffuse is already a predefined merge tool, so mergetool.diffuse.cmd is\nignored.  Try using a different name.\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"},{"id":"178193","messageId":"7vaa8s592k.fsf@alter.siamese.dyndns.org","threadId":"28750","inReplyTo":"m21uu4hzmq.fsf@linux-m68k.org","subject":"Re: git mergetool ignores configured command line","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-10-23T09:52:19Z","receivedAt":"2011-10-23T09:52:19Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Andreas Schwab <schwab@linux-m68k.org> writes:\n\n> diffuse is already a predefined merge tool, so mergetool.diffuse.cmd is\n> ignored.  Try using a different name.\n\nI wonder if we can improve this, though.\n\nIt is nice that we give canned definition of argument order to so many\nobscure tools, but instead of ignoring mergetool.<tool>.cmd when the user\ntold us to use <tool>, couldn't we simply ignore what we have internally\nas canned definition?\n\nEven if such a change were too intrusive (I didn't check), could we have\na decency to at least warn that we are ignoring the configuration?\n"},{"id":"178195","messageId":"20111023103459.GA29816@gmail.com","threadId":"28750","inReplyTo":"7vaa8s592k.fsf@alter.siamese.dyndns.org","subject":"Re: git mergetool ignores configured command line","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2011-10-23T10:35:01Z","receivedAt":"2011-10-23T10:35:01Z","isPatch":false,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On Sun, Oct 23, 2011 at 02:52:19AM -0700, Junio C Hamano wrote:\n> Andreas Schwab <schwab@linux-m68k.org> writes:\n> \n> > diffuse is already a predefined merge tool, so mergetool.diffuse.cmd is\n> > ignored.  Try using a different name.\n> \n> I wonder if we can improve this, though.\n> \n> It is nice that we give canned definition of argument order to so many\n> obscure tools, but instead of ignoring mergetool.<tool>.cmd when the user\n> told us to use <tool>, couldn't we simply ignore what we have internally\n> as canned definition?\n> \n> Even if such a change were too intrusive (I didn't check), could we have\n> a decency to at least warn that we are ignoring the configuration?\n\nI agree.  Ideally, we should honor their configuration.\nI'll see if doing so is not too intrusive.\n-- \n\t\t\t\t\tDavid\n"}]}