pull: introduce a pull.rebase option to enable --rebase

diff --git a/Documentation/git-write-tree.txt b/Documentation/git-write-tree.txt
index bfceacacb34262b73507a87fa23995d1183a3edc..e8c94c1352a8f1a889225ee063b4c59799cbb7e6 100644 (file)
--- a/Documentation/git-write-tree.txt
+++ b/Documentation/git-write-tree.txt
@@ -36,15 +36,6 @@ OPTIONS
        `<prefix>`.  This can be used to write the tree object
        for a subproject that is in the named subdirectory.
 
-
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-
-Documentation
---------------
-Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite