summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-15 13:32:09 -0700
committerJunio C Hamano <gitster@pobox.com>2011-03-15 13:32:09 -0700
commit1d5742cbf746f9556e6aefdfbed54c452c235d51 (patch)
treeed10a8a35c9cc115e883780907f2a1faf24d6719 /Documentation/git-difftool.txt
parenta35138af75070adb32cf281a56186c9343af36a4 (diff)
parentd8f708f860095245c6973ba6b1ada366ce2d5bdf (diff)
downloadgit-1d5742cbf746f9556e6aefdfbed54c452c235d51.tar.gz
Merge branch 'jk/doc-credits' of git://github.com/peff/git
* 'jk/doc-credits' of git://github.com/peff/git: docs: point git.txt author credits to git-scm.com doc: add missing git footers doc: drop author/documentation sections from most pages
Diffstat (limited to 'Documentation/git-difftool.txt')
-rw-r--r--Documentation/git-difftool.txt9
1 files changed, 0 insertions, 9 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index db87f1d423..a5d9c121f1 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -109,15 +109,6 @@ linkgit:git-mergetool[1]::
linkgit:git-config[1]::
Get and set repository or global options
-
-AUTHOR
-------
-Written by David Aguilar <davvid@gmail.com>.
-
-Documentation
---------------
-Documentation by David Aguilar and the git-list <git@vger.kernel.org>.
-
GIT
---
Part of the linkgit:git[1] suite