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-fmt-merge-msg.txt | |
parent | a35138af75070adb32cf281a56186c9343af36a4 (diff) | |
parent | d8f708f860095245c6973ba6b1ada366ce2d5bdf (diff) | |
download | git-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-fmt-merge-msg.txt')
-rw-r--r-- | Documentation/git-fmt-merge-msg.txt | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt index 75adf7a502..32aff954a2 100644 --- a/Documentation/git-fmt-merge-msg.txt +++ b/Documentation/git-fmt-merge-msg.txt @@ -67,15 +67,6 @@ SEE ALSO -------- linkgit:git-merge[1] - -Author ------- -Written by Junio C Hamano <gitster@pobox.com> - -Documentation --------------- -Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>. - GIT --- Part of the linkgit:git[1] suite |