threads / patch / 45273

patch, 3 partsRemove outdated info in difftool manpage

Subject: [PATCH 3/3] Remove outdated info in difftool manpage

## tl;dr

5 messages between Mar 3, 2017 and Mar 4, 2017. Diffs are folded; open one to read it.

replies: 4people: 4as markdown or json

Denton Liu· Mar 3, 2017, 11:57 UTC · lore

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 <liu.denton@gmail.com>
---
 Documentation/git-difftool.txt | 3 ---
 1 file changed, 3 deletions(-)

Show changes to Documentation/git-difftool.txt +0 −3

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· Mar 3, 2017, 15:46 UTC · re: Denton Liu · lore

Re: [PATCH 3/3] Remove outdated info in difftool manpage

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· Mar 3, 2017, 19:29 UTC · re: Johannes Schindelin · lore

Re: [PATCH 3/3] Remove outdated info in difftool manpage

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 10 quoted lines

> 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· Mar 3, 2017, 21:28 UTC · re: Johannes Schindelin · lore

Re: [PATCH 3/3] Remove outdated info in difftool manpage

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.

Show 9 quoted lines

> 
> 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· Mar 4, 2017, 20:46 UTC · re: Denton Liu · lore

Re: [PATCH 3/3] Remove outdated info in difftool manpage

On Fri, Mar 03, 2017 at 01:28:36PM -0800, Denton Liu wrote:

Show 14 quoted lines

> 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