merge-recursive --renormalize

diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt
index 3b0ea2c591941b9de3f0166f6a27c52c9b62961d..ea753cdafce66c33a0a0e8d9a52d75c974194ad5 100644 (file)
--- a/Documentation/git-whatchanged.txt
+++ b/Documentation/git-whatchanged.txt
@@ -13,8 +13,8 @@ SYNOPSIS
 DESCRIPTION
 -----------
 Shows commit logs and diff output each commit introduces.  The
-command internally invokes `git-rev-list` piped to
-`git-diff-tree`, and takes command line options for both of
+command internally invokes 'git rev-list' piped to
+'git diff-tree', and takes command line options for both of
 these commands.
 
 This manual page describes only the most frequently used options.
@@ -67,7 +67,7 @@ git whatchanged --since="2 weeks ago" \-- gitk::
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org> and
-Junio C Hamano <junkio@cox.net>
+Junio C Hamano <gitster@pobox.com>
 
 
 Documentation