Merge branch 'master' into jc/fmt-patch

diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt
index f02f939baa9183325d582cc12486a24f3d3ff30f..641cb7ea97feee2971f59cd6113dc85bd41b4480 100644 (file)
--- a/Documentation/git-whatchanged.txt
+++ b/Documentation/git-whatchanged.txt
@@ -47,9 +47,9 @@ OPTIONS
        By default, differences for merge commits are not shown.
        With this flag, show differences to that commit from all
        of its parents.
-
-       However, it is not very useful in general, although it
-       *is* useful on a file-by-file basis.
++
+However, it is not very useful in general, although it
+*is* useful on a file-by-file basis.
 
 Examples
 --------