aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc
diff options
context:
space:
mode:
authorGlenn Morris2017-11-20 13:08:35 -0500
committerGlenn Morris2017-11-20 13:08:35 -0500
commit33bfbfee7ef04392b0c30ca2ab5074a14c4ddad7 (patch)
tree1f9432682a7bff627f7208bcd8cc594bf7b5d60a /lisp/vc
parent7cf41d8088284c2fe8b1807d07fc082a270e6a78 (diff)
parent6e6bf60eab1e921605064e3d39ea080639f8e0f6 (diff)
downloademacs-33bfbfee7ef04392b0c30ca2ab5074a14c4ddad7.tar.gz
emacs-33bfbfee7ef04392b0c30ca2ab5074a14c4ddad7.zip
Merge from origin/emacs-26
6e6bf60 Don't let delete_frame select a tooltip frame (Bug#27647) e9dd580 Filter obtrusive events in help-read-key-sequence. 90075e8 Fix symlink flag in tramp-gvfs-handle-file-attributes c355529 Fix bug in tramp-handle-file-truename 4c21d04 Fix a typo in doc string of electric-indent-functions-without... 319c2de Avoid assertion violations in echo_area_display 63c7733 ; * lisp/ido.el (ido-find-alternate-file): Doc fix. (Bug#29278) cbd319a Fix case-folding in Occur 29520b0 Fix quick-calc in C mode with hex values 3e80124 Improve documentation of dired-next/prev-marked-file 90add18 Prevent aborts in line-move-visual 648c128 More fixes in src/.gdbinit 104f3e5 Document how to enter whitespace when using grep-read-files
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/vc-git.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index f95e67f4f56..dff0fd1365c 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1408,7 +1408,9 @@ This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"."
1408 "Run git grep, searching for REGEXP in FILES in directory DIR. 1408 "Run git grep, searching for REGEXP in FILES in directory DIR.
1409The search is limited to file names matching shell pattern FILES. 1409The search is limited to file names matching shell pattern FILES.
1410FILES may use abbreviations defined in `grep-files-aliases', e.g. 1410FILES may use abbreviations defined in `grep-files-aliases', e.g.
1411entering `ch' is equivalent to `*.[ch]'. 1411entering `ch' is equivalent to `*.[ch]'. As whitespace triggers
1412completion when entering a pattern, including it requires
1413quoting, e.g. `\\[quoted-insert]<space>'.
1412 1414
1413With \\[universal-argument] prefix, you can edit the constructed shell command line 1415With \\[universal-argument] prefix, you can edit the constructed shell command line
1414before it is executed. 1416before it is executed.