Merge branch 'jk/merge-one-file-working-tree' into maint

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 8728f7a5142284d036594628cbb99da677c16651..79abc38e50a9a82243085383401b2d93468efaf3 100644 (file)
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -257,10 +257,6 @@ linkgit:git-commit[1],
 linkgit:git-reflog[1],
 linkgit:git-reset[1]
 
-AUTHOR
-------
-Written by Nanako Shiraishi <nanako3@bluebottle.com>
-
 GIT
 ---
 Part of the linkgit:git[1] suite