summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-25 11:45:27 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-25 11:45:27 -0700
commitf526d120f649ec4426b559e94e09655b5a4f2b87 (patch)
treed1be8cbf55a8f0913b4347bece6ea5ecbcb580b0 /Documentation
parentba4d01bd74edae1e4adb540a03ba17961f8dd4b2 (diff)
parent9eafa1201b2dcc703258ca7cd53de8ac4de74565 (diff)
downloadgit-f526d120f649ec4426b559e94e09655b5a4f2b87.tar.gz
Merge branch 'maint'
* maint: msvc: Fix some compiler warnings Documentation: grep: fix asciidoc problem with -- msvc: Fix some "expr evaluates to function" compiler warnings
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-grep.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 4b32322a67..912bddd7b6 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -183,7 +183,7 @@ OPTIONS
Examples
--------
-git grep 'time_t' -- '*.[ch]'::
+git grep 'time_t' \-- '*.[ch]'::
Looks for `time_t` in all tracked .c and .h files in the working
directory and its subdirectories.