Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 06ab79fbd1bba327c82f392e68405ba9d3494951..35298e626be6bd440d6451c0b6205298c9d1fe19 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -921,7 +921,7 @@ file such that it contained the given content either before or after the
 commit.  You can find out with this:
 
 -------------------------------------------------
-$  git log --raw -r --abbrev=40 --pretty=oneline -- filename |
+$  git log --raw --abbrev=40 --pretty=oneline -- filename |
        grep -B 1 `git hash-object filename`
 -------------------------------------------------