Merge branch 'maint'

[git.git] / Documentation / git-rerere.txt

diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index 666349d178f071363f317e9a477a19e68bd23b7b..89f321b414212a555f1e0fb0ff0ce6f4c180fd06 100644 (file)
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -37,7 +37,7 @@ its working state.
 'clear'::
 
 This resets the metadata used by rerere if a merge resolution is to be
-is aborted.  Calling 'git-am --skip' or 'git-rebase [--skip|--abort]'
+aborted.  Calling 'git-am [--skip|--abort]' or 'git-rebase [--skip|--abort]'
 will automatically invoke this command.
 
 'diff'::
@@ -45,7 +45,7 @@ will automatically invoke this command.
 This displays diffs for the current state of the resolution.  It is
 useful for tracking what has changed while the user is resolving
 conflicts.  Additional arguments are passed directly to the system
-`diff` command installed in PATH.
+'diff' command installed in PATH.
 
 'status'::
 
@@ -204,7 +204,7 @@ conflict.
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 GIT
 ---