Merge branch 'js/shortlog'

diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt
index f02f939baa9183325d582cc12486a24f3d3ff30f..e8f21d02f774a914e7e8840150f6db86a2884178 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
 --------
@@ -58,7 +58,7 @@ git-whatchanged -p v2.6.12.. include/scsi drivers/scsi::
        Show as patches the commits since version 'v2.6.12' that changed
        any file in the include/scsi or drivers/scsi subdirectories
 
-git-whatchanged --since="2 weeks ago" -- gitk::
+git-whatchanged --since="2 weeks ago" \-- gitk::
 
        Show the changes during the last two weeks to the file 'gitk'.
        The "--" is necessary to avoid confusion with the *branch* named