Merge branch 'mg/diff-uiconfig-doc' into maint

diff --git a/Documentation/git-update-ref.txt b/Documentation/git-update-ref.txt
index 9639f705afafab6fcf0cd21ad2693627ab42f66d..e25a65a80fafb7143957247e2fd85d64a701ddf5 100644 (file)
--- a/Documentation/git-update-ref.txt
+++ b/Documentation/git-update-ref.txt
@@ -84,10 +84,6 @@ An update will fail (without changing <ref>) if the current user is
 unable to create a new log file, append to the existing log file
 or does not have committer information available.
 
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite