Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

git-difftool: update difftool documentation to include some packaging…

… notes

difftool is now available in cola.git and git.git.
Mention this and recommend usage of the version from git.git.

Signed-off-by: David Aguilar <davvid@gmail.com>
  • Loading branch information...
commit e2657c59adcf51bb12d1e9566e6c3b341acaee03 1 parent c6b12a1
@davvid davvid authored
Showing with 8 additions and 9 deletions.
  1. +8 −9 share/doc/cola/git-difftool.txt
View
17 share/doc/cola/git-difftool.txt
@@ -86,15 +86,6 @@ linkgit:git-diff[1]::
linkcola:git-cola[1]::
'git-difftool' is part of the 'git-cola' project.
-+
-NOTE: Patches to add 'git-difftool' to git.git's contrib area
-have been sent to the git mailing list. If difftool makes it in
-then packagers are encouraged to use git.git's contrib/difftool/
-scripts instead of the one provided here.
-+
-If git.git makes difftool part of the core command set then
-cola will conditionally install difftool based on the user's
-git version.
linkgit:git-mergetool[1]::
Run merge conflict resolution tools to resolve merge conflicts
@@ -114,3 +105,11 @@ Documentation by David Aguilar and the git-list <git@vger.kernel.org>.
GIT
---
Part of the linkgit:git[1] suite
+
+
+NOTE: Patches to add 'git-difftool' to git.git's contrib area
+have been sent to the git mailing list. Packagers are encouraged
+to use git.git's contrib/difftool/ scripts instead of the ones
+distributed with cola. If git decides to make difftool part of
+its core command set then cola will promptly add build rules to
+conditionally install difftool based on the user's git version.
Please sign in to comment.
Something went wrong with that request. Please try again.