Merge branch 'maint-1.6.1' into maint

diff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt
index 146d7f545cb2f85177c8143b7e7b999ae8303d71..7f7a5445c7d043dc2f28cfbca63732a417d91a87 100644 (file)
--- a/Documentation/git-reflog.txt
+++ b/Documentation/git-reflog.txt
@@ -28,7 +28,7 @@ updated.  This command is to manage the information recorded in it.
 
 The subcommand "expire" is used to prune older reflog entries.
 Entries older than `expire` time, or entries older than
-`expire-unreachable` time and are not reachable from the current
+`expire-unreachable` time and not reachable from the current
 tip, are removed from the reflog.  This is typically not used
 directly by the end users -- instead, see linkgit:git-gc[1].
 
@@ -71,7 +71,7 @@ them.
        which in turn defaults to 90 days.
 
 --expire-unreachable=<time>::
-       Entries older than this time and are not reachable from
+       Entries older than this time and not reachable from
        the current tip of the branch are pruned.  Without the
        option it is taken from configuration
        `gc.reflogExpireUnreachable`, which in turn defaults to
@@ -94,7 +94,7 @@ them.
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 Documentation
 --------------