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

diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt
index e05b686b1e4784290e40993469a2c5fab9b4ce5d..781bd6edc3cce9d1488bf793231d08119e142948 100644 (file)
--- a/Documentation/git-fast-export.txt
+++ b/Documentation/git-fast-export.txt
@@ -135,15 +135,6 @@ Since 'git fast-import' cannot tag trees, you will not be
 able to export the linux-2.6.git repository completely, as it contains
 a tag referencing a tree instead of a commit.
 
-
-Author
-------
-Written by Johannes E. Schindelin <johannes.schindelin@gmx.de>.
-
-Documentation
---------------
-Documentation by Johannes E. Schindelin <johannes.schindelin@gmx.de>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite