diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-15 13:32:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-15 13:32:09 -0700 |
| commit | 1d5742cbf746f9556e6aefdfbed54c452c235d51 (patch) | |
| tree | ed10a8a35c9cc115e883780907f2a1faf24d6719 /Documentation/git-mergetool.txt | |
| parent | Merge branch 'sp/maint-smart-http-sans-100-continue' (diff) | |
| parent | docs: point git.txt author credits to git-scm.com (diff) | |
| download | tgif-1d5742cbf746f9556e6aefdfbed54c452c235d51.tar.xz | |
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-mergetool.txt')
| -rw-r--r-- | Documentation/git-mergetool.txt | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 1f75a848ba..1834adba75 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -82,14 +82,6 @@ Setting the `mergetool.keepBackup` configuration variable to `false` causes `git mergetool` to automatically remove the backup as files are successfully merged. -Author ------- -Written by Theodore Y Ts'o <tytso@mit.edu> - -Documentation --------------- -Documentation by Theodore Y Ts'o. - GIT --- Part of the linkgit:git[1] suite |