# [PATCH 3/3] Remove outdated info in difftool manpage 5 messages from 2017-03-03 to 2017-03-04. Participants: Denton Liu, Johannes Schindelin, Junio C Hamano, David Aguilar. Thread: https://gitlist.dev/t/45273 ## Denton Liu, 2017-03-03 11:57 Subject: [PATCH 3/3] Remove outdated info in difftool manpage Message-ID: <20170303115751.GA13225@arch-attack.localdomain> URL: https://gitlist.dev/e/20170303115751.GA13225%40arch-attack.localdomain ``` When difftool was rewritten in C, it removed the capability to read fallback configs from mergetool. This changes the documentation to reflect this. Signed-off-by: Denton Liu --- Documentation/git-difftool.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 96c26e6aa..a00cb033e 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -105,9 +105,6 @@ See linkgit:git-diff[1] for the full list of supported options. CONFIG VARIABLES ---------------- -'git difftool' falls back to 'git mergetool' config variables when the -difftool equivalents have not been defined. - diff.tool:: The default diff tool to use. -- 2.12.0.1.g5415fdfc5.dirty ``` ## Johannes Schindelin, 2017-03-03 15:46 Subject: Re: [PATCH 3/3] Remove outdated info in difftool manpage Message-ID: URL: https://gitlist.dev/e/alpine.DEB.2.20.1703031645470.3767%40virtualbox In-Reply-To: <20170303115751.GA13225@arch-attack.localdomain> ``` Hi Denton (or should I address you as Liu?), On Fri, 3 Mar 2017, Denton Liu wrote: > When difftool was rewritten in C, it removed the capability to read > fallback configs from mergetool. This changes the documentation to > reflect this. Thanks for pointing that out. But that is probably an oversight on my part, not an intentional change... Ciao, Johannes ``` ## Junio C Hamano, 2017-03-03 19:29 Subject: Re: [PATCH 3/3] Remove outdated info in difftool manpage Message-ID: URL: https://gitlist.dev/e/xmqqh93a88gu.fsf%40gitster.mtv.corp.google.com In-Reply-To: ``` Johannes Schindelin writes: > Hi Denton (or should I address you as Liu?), > > On Fri, 3 Mar 2017, Denton Liu wrote: > >> When difftool was rewritten in C, it removed the capability to read >> fallback configs from mergetool. This changes the documentation to >> reflect this. > > Thanks for pointing that out. But that is probably an oversight on my > part, not an intentional change... So, ... in the meantime we'll hold off of this removal from the documentation and wait for the "capability" to get restored? ``` ## Denton Liu, 2017-03-03 21:28 Subject: Re: [PATCH 3/3] Remove outdated info in difftool manpage Message-ID: <20170303212836.GB13790@arch-attack.localdomain> URL: https://gitlist.dev/e/20170303212836.GB13790%40arch-attack.localdomain In-Reply-To: ``` On Fri, Mar 03, 2017 at 04:46:36PM +0100, Johannes Schindelin wrote: > Hi Denton (or should I address you as Liu?), Denton is fine, thanks. > > On Fri, 3 Mar 2017, Denton Liu wrote: > > > When difftool was rewritten in C, it removed the capability to read > > fallback configs from mergetool. This changes the documentation to > > reflect this. > > Thanks for pointing that out. But that is probably an oversight on my > part, not an intentional change... Do you expect to be submitting a patch for this soon? Or, if not, would it be fine if I went ahead and did it? > > Ciao, > Johannes ``` ## David Aguilar, 2017-03-04 20:46 Subject: Re: [PATCH 3/3] Remove outdated info in difftool manpage Message-ID: <20170304204658.a3xo2j2aggf22rd5@gmail.com> URL: https://gitlist.dev/e/20170304204658.a3xo2j2aggf22rd5%40gmail.com In-Reply-To: <20170303212836.GB13790@arch-attack.localdomain> ``` On Fri, Mar 03, 2017 at 01:28:36PM -0800, Denton Liu wrote: > On Fri, Mar 03, 2017 at 04:46:36PM +0100, Johannes Schindelin wrote: > > Hi Denton (or should I address you as Liu?), > Denton is fine, thanks. > > > > On Fri, 3 Mar 2017, Denton Liu wrote: > > > > > When difftool was rewritten in C, it removed the capability to read > > > fallback configs from mergetool. This changes the documentation to > > > reflect this. > > > > Thanks for pointing that out. But that is probably an oversight on my > > part, not an intentional change... > Do you expect to be submitting a patch for this soon? Or, if not, would > it be fine if I went ahead and did it? Thanks for spotting this. It'd be good to fix this so I'm sure no one would mind if you submitted a patch ;-) I'd be happy to test your patch if you have one. -- David ```