Merge branch 'jm/maint-misc-fix' into maint

[git.git] / Documentation / git-remote.txt

diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 79e38fedd7efffb1a07f6d82ce4325a81136ed6f..528f34a13106836c1eace8c5d8972543b6fcc121 100644 (file)
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -75,10 +75,6 @@ because a fetch would overwrite any local commits.
 +
 When a push mirror is created with `\--mirror=push`, then `git push`
 will always behave as if `\--mirror` was passed.
-+
-The option `\--mirror` (with no type) sets up both push and fetch
-mirror configuration. It is kept for historical purposes, and is
-probably not what you want.
 
 'rename'::
 
@@ -221,16 +217,6 @@ linkgit:git-fetch[1]
 linkgit:git-branch[1]
 linkgit:git-config[1]
 
-Author
-------
-Written by Junio Hamano
-
-
-Documentation
---------------
-Documentation by J. Bruce Fields and the git-list <git@vger.kernel.org>.
-
-
 GIT
 ---
 Part of the linkgit:git[1] suite