Merge branch 'master' into next

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index af378ffcf9b09bd3ae01566e405aadec75c28e61..c9ffff734c256d7db1470381f0eb74a8d7f81873 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -51,7 +51,7 @@ git log v2.6.12.. include/scsi drivers/scsi::
        Show all commits since version 'v2.6.12' that changed any file
        in the include/scsi or drivers/scsi subdirectories
 
-git log --since="2 weeks ago" -- gitk::
+git log --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