{"thread":{"id":"45273","subject":"[PATCH 3/3] Remove outdated info in difftool manpage","startedAt":"2017-03-03T11:58:05Z","lastAt":"2017-03-04T20:47:08Z","messageCount":5,"participants":["Denton Liu","Johannes Schindelin","Junio C Hamano","David Aguilar"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"313165","messageId":"20170303115751.GA13225@arch-attack.localdomain","threadId":"45273","inReplyTo":null,"subject":"[PATCH 3/3] Remove outdated info in difftool manpage","fromName":"Denton Liu","fromEmail":"liu.denton@gmail.com","sentAt":"2017-03-03T11:57:51Z","receivedAt":"2017-03-03T11:58:05Z","isPatch":true,"sender":{"key":"liu.denton@gmail.com","avatar":"https://avatars.githubusercontent.com/u/9620836?v=4"},"body":"When difftool was rewritten in C, it removed the capability to read\nfallback configs from mergetool. This changes the documentation to\nreflect this.\n\nSigned-off-by: Denton Liu <liu.denton@gmail.com>\n---\n Documentation/git-difftool.txt | 3 ---\n 1 file changed, 3 deletions(-)\n\ndiff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt\nindex 96c26e6aa..a00cb033e 100644\n--- a/Documentation/git-difftool.txt\n+++ b/Documentation/git-difftool.txt\n@@ -105,9 +105,6 @@ See linkgit:git-diff[1] for the full list of supported options.\n \n CONFIG VARIABLES\n ----------------\n-'git difftool' falls back to 'git mergetool' config variables when the\n-difftool equivalents have not been defined.\n-\n diff.tool::\n \tThe default diff tool to use.\n \n-- \n2.12.0.1.g5415fdfc5.dirty\n\n"},{"id":"313189","messageId":"alpine.DEB.2.20.1703031645470.3767@virtualbox","threadId":"45273","inReplyTo":"20170303115751.GA13225@arch-attack.localdomain","subject":"Re: [PATCH 3/3] Remove outdated info in difftool manpage","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2017-03-03T15:46:36Z","receivedAt":"2017-03-03T15:54:43Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Denton (or should I address you as Liu?),\n\nOn Fri, 3 Mar 2017, Denton Liu wrote:\n\n> When difftool was rewritten in C, it removed the capability to read\n> fallback configs from mergetool. This changes the documentation to\n> reflect this.\n\nThanks for pointing that out. But that is probably an oversight on my\npart, not an intentional change...\n\nCiao,\nJohannes\n"},{"id":"313224","messageId":"xmqqh93a88gu.fsf@gitster.mtv.corp.google.com","threadId":"45273","inReplyTo":"alpine.DEB.2.20.1703031645470.3767@virtualbox","subject":"Re: [PATCH 3/3] Remove outdated info in difftool manpage","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-03-03T19:29:37Z","receivedAt":"2017-03-03T19:33:11Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n\n> Hi Denton (or should I address you as Liu?),\n>\n> On Fri, 3 Mar 2017, Denton Liu wrote:\n>\n>> When difftool was rewritten in C, it removed the capability to read\n>> fallback configs from mergetool. This changes the documentation to\n>> reflect this.\n>\n> Thanks for pointing that out. But that is probably an oversight on my\n> part, not an intentional change...\n\nSo, ... in the meantime we'll hold off of this removal from the\ndocumentation and wait for the \"capability\" to get restored?\n"},{"id":"313237","messageId":"20170303212836.GB13790@arch-attack.localdomain","threadId":"45273","inReplyTo":"alpine.DEB.2.20.1703031645470.3767@virtualbox","subject":"Re: [PATCH 3/3] Remove outdated info in difftool manpage","fromName":"Denton Liu","fromEmail":"liu.denton@gmail.com","sentAt":"2017-03-03T21:28:36Z","receivedAt":"2017-03-03T21:30:12Z","isPatch":true,"sender":{"key":"liu.denton@gmail.com","avatar":"https://avatars.githubusercontent.com/u/9620836?v=4"},"body":"On Fri, Mar 03, 2017 at 04:46:36PM +0100, Johannes Schindelin wrote:\n> Hi Denton (or should I address you as Liu?),\nDenton is fine, thanks.\n> \n> On Fri, 3 Mar 2017, Denton Liu wrote:\n> \n> > When difftool was rewritten in C, it removed the capability to read\n> > fallback configs from mergetool. This changes the documentation to\n> > reflect this.\n> \n> Thanks for pointing that out. But that is probably an oversight on my\n> part, not an intentional change...\nDo you expect to be submitting a patch for this soon? Or, if not, would\nit be fine if I went ahead and did it?\n> \n> Ciao,\n> Johannes\n"},{"id":"313285","messageId":"20170304204658.a3xo2j2aggf22rd5@gmail.com","threadId":"45273","inReplyTo":"20170303212836.GB13790@arch-attack.localdomain","subject":"Re: [PATCH 3/3] Remove outdated info in difftool manpage","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2017-03-04T20:46:58Z","receivedAt":"2017-03-04T20:47:08Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On Fri, Mar 03, 2017 at 01:28:36PM -0800, Denton Liu wrote:\n> On Fri, Mar 03, 2017 at 04:46:36PM +0100, Johannes Schindelin wrote:\n> > Hi Denton (or should I address you as Liu?),\n> Denton is fine, thanks.\n> > \n> > On Fri, 3 Mar 2017, Denton Liu wrote:\n> > \n> > > When difftool was rewritten in C, it removed the capability to read\n> > > fallback configs from mergetool. This changes the documentation to\n> > > reflect this.\n> > \n> > Thanks for pointing that out. But that is probably an oversight on my\n> > part, not an intentional change...\n> Do you expect to be submitting a patch for this soon? Or, if not, would\n> it be fine if I went ahead and did it?\n\nThanks for spotting this.  It'd be good to fix this so\nI'm sure no one would mind if you submitted a patch ;-)\n\nI'd be happy to test your patch if you have one.\n-- \nDavid\n"}]}