* [PATCH 3/3] Remove outdated info in difftool manpage
@ 2017-03-03 11:57 Denton Liu
2017-03-03 15:46 ` Johannes Schindelin
0 siblings, 1 reply; 5+ messages in thread
From: Denton Liu @ 2017-03-03 11:57 UTC (permalink / raw)
To: git; +Cc: davvid, Johannes.Schindelin
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(-)
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 3/3] Remove outdated info in difftool manpage
2017-03-03 11:57 [PATCH 3/3] Remove outdated info in difftool manpage Denton Liu
@ 2017-03-03 15:46 ` Johannes Schindelin
2017-03-03 19:29 ` Junio C Hamano
2017-03-03 21:28 ` Denton Liu
0 siblings, 2 replies; 5+ messages in thread
From: Johannes Schindelin @ 2017-03-03 15:46 UTC (permalink / raw)
To: Denton Liu; +Cc: git, davvid
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 3/3] Remove outdated info in difftool manpage
2017-03-03 15:46 ` Johannes Schindelin
@ 2017-03-03 19:29 ` Junio C Hamano
2017-03-03 21:28 ` Denton Liu
1 sibling, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2017-03-03 19:29 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Denton Liu, git, davvid
Johannes Schindelin <Johannes.Schindelin@gmx.de> 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?
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 3/3] Remove outdated info in difftool manpage
2017-03-03 15:46 ` Johannes Schindelin
2017-03-03 19:29 ` Junio C Hamano
@ 2017-03-03 21:28 ` Denton Liu
2017-03-04 20:46 ` David Aguilar
1 sibling, 1 reply; 5+ messages in thread
From: Denton Liu @ 2017-03-03 21:28 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git, davvid
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 3/3] Remove outdated info in difftool manpage
2017-03-03 21:28 ` Denton Liu
@ 2017-03-04 20:46 ` David Aguilar
0 siblings, 0 replies; 5+ messages in thread
From: David Aguilar @ 2017-03-04 20:46 UTC (permalink / raw)
To: Denton Liu; +Cc: Johannes Schindelin, git
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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-03-04 20:47 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-03 11:57 [PATCH 3/3] Remove outdated info in difftool manpage Denton Liu
2017-03-03 15:46 ` Johannes Schindelin
2017-03-03 19:29 ` Junio C Hamano
2017-03-03 21:28 ` Denton Liu
2017-03-04 20:46 ` David Aguilar
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).