Revision 79a77109d3d0d364910ff7fa8c605c554dc4c3e0 authored by René Scharfe on 27 October 2014, 18:23:05 UTC, committed by Junio C Hamano on 28 October 2014, 17:33:50 UTC
The config option color.grep.match can be used to specify the highlighting color for matching strings. Add the options matchContext and matchSelected to allow different colors to be specified for matching strings in the context vs. in selected lines. This is similar to the ms and mc specifiers in GNU grep's environment variable GREP_COLORS. Tests are from Zoltan Klinger's earlier attempt to solve the same issue in a different way. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent eeff891
| File | Mode | Size |
|---|---|---|
| RelNotes | ||
| howto | ||
| technical | ||
| .gitattributes | -rw-r--r-- | 17 bytes |
| .gitignore | -rw-r--r-- | 135 bytes |
| CodingGuidelines | -rw-r--r-- | 12.0 KB |
| Makefile | -rw-r--r-- | 12.3 KB |
| SubmittingPatches | -rw-r--r-- | 18.4 KB |
| asciidoc.conf | -rw-r--r-- | 2.3 KB |
| blame-options.txt | -rw-r--r-- | 3.8 KB |
| build-docdep.perl | -rwxr-xr-x | 968 bytes |
| cat-texi.perl | -rwxr-xr-x | 776 bytes |
| cmd-list.perl | -rwxr-xr-x | 1.4 KB |
| config.txt | -rw-r--r-- | 96.3 KB |
| date-formats.txt | -rw-r--r-- | 850 bytes |
| diff-config.txt | -rw-r--r-- | 7.1 KB |
| diff-format.txt | -rw-r--r-- | 5.4 KB |
| diff-generate-patch.txt | -rw-r--r-- | 6.4 KB |
| diff-options.txt | -rw-r--r-- | 19.1 KB |
| docbook-xsl.css | -rw-r--r-- | 4.5 KB |
| docbook.xsl | -rw-r--r-- | 362 bytes |
| everyday.txt | -rw-r--r-- | 12.7 KB |
| fetch-options.txt | -rw-r--r-- | 4.2 KB |
| fix-texi.perl | -rwxr-xr-x | 309 bytes |
| git-add.txt | -rw-r--r-- | 14.0 KB |
| git-am.txt | -rw-r--r-- | 6.0 KB |
| git-annotate.txt | -rw-r--r-- | 752 bytes |
| git-apply.txt | -rw-r--r-- | 9.6 KB |
| git-archimport.txt | -rw-r--r-- | 3.9 KB |
| git-archive.txt | -rw-r--r-- | 6.0 KB |
| git-bisect-lk2009.txt | -rw-r--r-- | 48.1 KB |
| git-bisect.txt | -rw-r--r-- | 12.4 KB |
| git-blame.txt | -rw-r--r-- | 7.8 KB |
| git-branch.txt | -rw-r--r-- | 10.0 KB |
| git-bundle.txt | -rw-r--r-- | 6.9 KB |
| git-cat-file.txt | -rw-r--r-- | 4.9 KB |
| git-check-attr.txt | -rw-r--r-- | 3.1 KB |
| git-check-ignore.txt | -rw-r--r-- | 3.7 KB |
| git-check-mailmap.txt | -rw-r--r-- | 946 bytes |
| git-check-ref-format.txt | -rw-r--r-- | 4.1 KB |
| git-checkout-index.txt | -rw-r--r-- | 5.3 KB |
| git-checkout.txt | -rw-r--r-- | 15.7 KB |
| git-cherry-pick.txt | -rw-r--r-- | 7.7 KB |
| git-cherry.txt | -rw-r--r-- | 3.5 KB |
| git-citool.txt | -rw-r--r-- | 543 bytes |
| git-clean.txt | -rw-r--r-- | 4.0 KB |
| git-clone.txt | -rw-r--r-- | 9.7 KB |
| git-column.txt | -rw-r--r-- | 1.1 KB |
| git-commit-tree.txt | -rw-r--r-- | 2.8 KB |
| git-commit.txt | -rw-r--r-- | 15.0 KB |
| git-config.txt | -rw-r--r-- | 12.9 KB |
| git-count-objects.txt | -rw-r--r-- | 1.1 KB |
| git-credential-cache--daemon.txt | -rw-r--r-- | 684 bytes |
| git-credential-cache.txt | -rw-r--r-- | 2.1 KB |
| git-credential-store.txt | -rw-r--r-- | 2.1 KB |
| git-credential.txt | -rw-r--r-- | 5.7 KB |
| git-cvsexportcommit.txt | -rw-r--r-- | 3.1 KB |
| git-cvsimport.txt | -rw-r--r-- | 7.6 KB |
| git-cvsserver.txt | -rw-r--r-- | 15.2 KB |
| git-daemon.txt | -rw-r--r-- | 11.6 KB |
| git-describe.txt | -rw-r--r-- | 5.9 KB |
| git-diff-files.txt | -rw-r--r-- | 1.2 KB |
| git-diff-index.txt | -rw-r--r-- | 4.5 KB |
| git-diff-tree.txt | -rw-r--r-- | 5.3 KB |
| git-diff.txt | -rw-r--r-- | 5.5 KB |
| git-difftool.txt | -rw-r--r-- | 4.0 KB |
| git-fast-export.txt | -rw-r--r-- | 5.2 KB |
| git-fast-import.txt | -rw-r--r-- | 53.8 KB |
| git-fetch-pack.txt | -rw-r--r-- | 3.3 KB |
| git-fetch.txt | -rw-r--r-- | 2.6 KB |
| git-filter-branch.txt | -rw-r--r-- | 16.8 KB |
| git-fmt-merge-msg.txt | -rw-r--r-- | 1.9 KB |
| git-for-each-ref.txt | -rw-r--r-- | 5.7 KB |
| git-format-patch.txt | -rw-r--r-- | 19.1 KB |
| git-fsck-objects.txt | -rw-r--r-- | 354 bytes |
| git-fsck.txt | -rw-r--r-- | 4.5 KB |
| git-gc.txt | -rw-r--r-- | 5.5 KB |
| git-get-tar-commit-id.txt | -rw-r--r-- | 737 bytes |
| git-grep.txt | -rw-r--r-- | 7.7 KB |
| git-gui.txt | -rw-r--r-- | 3.5 KB |
| git-hash-object.txt | -rw-r--r-- | 1.8 KB |
| git-help.txt | -rw-r--r-- | 6.0 KB |
| git-http-backend.txt | -rw-r--r-- | 9.5 KB |
| git-http-fetch.txt | -rw-r--r-- | 1.1 KB |
| git-http-push.txt | -rw-r--r-- | 2.9 KB |
| git-imap-send.txt | -rw-r--r-- | 4.2 KB |
| git-index-pack.txt | -rw-r--r-- | 3.4 KB |
| git-init-db.txt | -rw-r--r-- | 409 bytes |
| git-init.txt | -rw-r--r-- | 4.7 KB |
| git-instaweb.txt | -rw-r--r-- | 2.2 KB |
| git-log.txt | -rw-r--r-- | 6.2 KB |
| git-lost-found.txt | -rw-r--r-- | 1.7 KB |
| git-ls-files.txt | -rw-r--r-- | 6.1 KB |
| git-ls-remote.txt | -rw-r--r-- | 2.5 KB |
| git-ls-tree.txt | -rw-r--r-- | 2.9 KB |
| git-mailinfo.txt | -rw-r--r-- | 3.0 KB |
| git-mailsplit.txt | -rw-r--r-- | 1.2 KB |
| git-merge-base.txt | -rw-r--r-- | 4.3 KB |
| git-merge-file.txt | -rw-r--r-- | 2.8 KB |
| git-merge-index.txt | -rw-r--r-- | 2.4 KB |
| git-merge-one-file.txt | -rw-r--r-- | 387 bytes |
| git-merge-tree.txt | -rw-r--r-- | 750 bytes |
| git-merge.txt | -rw-r--r-- | 12.1 KB |
| git-mergetool--lib.txt | -rw-r--r-- | 1.2 KB |
| git-mergetool.txt | -rw-r--r-- | 3.3 KB |
| git-mktag.txt | -rw-r--r-- | 806 bytes |
| git-mktree.txt | -rw-r--r-- | 1.1 KB |
| git-mv.txt | -rw-r--r-- | 1.5 KB |
| git-name-rev.txt | -rw-r--r-- | 1.9 KB |
| git-notes.txt | -rw-r--r-- | 13.1 KB |
| git-p4.txt | -rw-r--r-- | 18.8 KB |
| git-pack-objects.txt | -rw-r--r-- | 8.9 KB |
| git-pack-redundant.txt | -rw-r--r-- | 1.1 KB |
| git-pack-refs.txt | -rw-r--r-- | 2.0 KB |
| git-parse-remote.txt | -rw-r--r-- | 471 bytes |
| git-patch-id.txt | -rw-r--r-- | 940 bytes |
| git-peek-remote.txt | -rw-r--r-- | 1.1 KB |
| git-prune-packed.txt | -rw-r--r-- | 941 bytes |
| git-prune.txt | -rw-r--r-- | 1.8 KB |
| git-pull.txt | -rw-r--r-- | 8.0 KB |
| git-push.txt | -rw-r--r-- | 19.5 KB |
| git-quiltimport.txt | -rw-r--r-- | 1.4 KB |
| git-read-tree.txt | -rw-r--r-- | 16.4 KB |
| git-rebase.txt | -rw-r--r-- | 24.1 KB |
| git-receive-pack.txt | -rw-r--r-- | 5.5 KB |
| git-reflog.txt | -rw-r--r-- | 3.4 KB |
| git-relink.txt | -rw-r--r-- | 649 bytes |
| git-remote-ext.txt | -rw-r--r-- | 3.9 KB |
| git-remote-fd.txt | -rw-r--r-- | 1.6 KB |
| git-remote-helpers.txto | -rw-r--r-- | 218 bytes |
| git-remote-testgit.txt | -rw-r--r-- | 570 bytes |
| git-remote.txt | -rw-r--r-- | 7.1 KB |
| git-repack.txt | -rw-r--r-- | 4.5 KB |
| git-replace.txt | -rw-r--r-- | 3.0 KB |
| git-repo-config.txt | -rw-r--r-- | 324 bytes |
| git-request-pull.txt | -rw-r--r-- | 528 bytes |
| git-rerere.txt | -rw-r--r-- | 7.3 KB |
| git-reset.txt | -rw-r--r-- | 14.1 KB |
| git-rev-list.txt | -rw-r--r-- | 3.6 KB |
| git-rev-parse.txt | -rw-r--r-- | 10.9 KB |
| git-revert.txt | -rw-r--r-- | 3.7 KB |
| git-rm.txt | -rw-r--r-- | 5.8 KB |
| git-send-email.txt | -rw-r--r-- | 14.2 KB |
| git-send-pack.txt | -rw-r--r-- | 3.6 KB |
| git-sh-i18n--envsubst.txt | -rw-r--r-- | 928 bytes |
| git-sh-i18n.txt | -rw-r--r-- | 1.1 KB |
| git-sh-setup.txt | -rw-r--r-- | 2.9 KB |
| git-shell.txt | -rw-r--r-- | 2.5 KB |
| git-shortlog.txt | -rw-r--r-- | 2.6 KB |
| git-show-branch.txt | -rw-r--r-- | 6.4 KB |
| git-show-index.txt | -rw-r--r-- | 478 bytes |
| git-show-ref.txt | -rw-r--r-- | 5.9 KB |
| git-show.txt | -rw-r--r-- | 1.8 KB |
| git-stage.txt | -rw-r--r-- | 300 bytes |
| git-stash.txt | -rw-r--r-- | 10.3 KB |
| git-status.txt | -rw-r--r-- | 8.2 KB |
| git-stripspace.txt | -rw-r--r-- | 1.8 KB |
| git-submodule.txt | -rw-r--r-- | 15.5 KB |
| git-svn.txt | -rw-r--r-- | 43.5 KB |
| git-symbolic-ref.txt | -rw-r--r-- | 1.9 KB |
| git-tag.txt | -rw-r--r-- | 9.9 KB |
| git-tar-tree.txt | -rw-r--r-- | 2.3 KB |
| git-tools.txt | -rw-r--r-- | 3.4 KB |
| git-unpack-file.txt | -rw-r--r-- | 434 bytes |
| git-unpack-objects.txt | -rw-r--r-- | 1.1 KB |
| git-update-index.txt | -rw-r--r-- | 13.2 KB |
| git-update-ref.txt | -rw-r--r-- | 5.0 KB |
| git-update-server-info.txt | -rw-r--r-- | 797 bytes |
| git-upload-archive.txt | -rw-r--r-- | 617 bytes |
| git-upload-pack.txt | -rw-r--r-- | 869 bytes |
| git-var.txt | -rw-r--r-- | 1.8 KB |
| git-verify-pack.txt | -rw-r--r-- | 1.1 KB |
| git-verify-tag.txt | -rw-r--r-- | 411 bytes |
| git-web--browse.txt | -rw-r--r-- | 3.5 KB |
| git-whatchanged.txt | -rw-r--r-- | 1.1 KB |
| git-write-tree.txt | -rw-r--r-- | 1.0 KB |
| git.txt | -rw-r--r-- | 33.7 KB |
| gitattributes.txt | -rw-r--r-- | 33.5 KB |
| gitcli.txt | -rw-r--r-- | 7.9 KB |
| gitcore-tutorial.txt | -rw-r--r-- | 61.4 KB |
| gitcredentials.txt | -rw-r--r-- | 5.9 KB |
| gitcvs-migration.txt | -rw-r--r-- | 7.4 KB |
| gitdiffcore.txt | -rw-r--r-- | 11.4 KB |
| gitglossary.txt | -rw-r--r-- | 369 bytes |
| githooks.txt | -rw-r--r-- | 13.5 KB |
| gitignore.txt | -rw-r--r-- | 6.6 KB |
| gitk.txt | -rw-r--r-- | 5.1 KB |
| gitmodules.txt | -rw-r--r-- | 3.9 KB |
| gitnamespaces.txt | -rw-r--r-- | 3.2 KB |
| gitremote-helpers.txt | -rw-r--r-- | 16.9 KB |
| gitrepository-layout.txt | -rw-r--r-- | 7.9 KB |
| gitrevisions.txt | -rw-r--r-- | 774 bytes |
| gittutorial-2.txt | -rw-r--r-- | 14.4 KB |
| gittutorial.txt | -rw-r--r-- | 22.4 KB |
| gitweb.conf.txt | -rw-r--r-- | 38.2 KB |
| gitweb.txt | -rw-r--r-- | 26.3 KB |
| gitworkflows.txt | -rw-r--r-- | 17.0 KB |
| glossary-content.txt | -rw-r--r-- | 24.5 KB |
| howto-index.sh | -rwxr-xr-x | 669 bytes |
| i18n.txt | -rw-r--r-- | 2.2 KB |
| install-doc-quick.sh | -rwxr-xr-x | 771 bytes |
| install-webdoc.sh | -rwxr-xr-x | 754 bytes |
| line-range-format.txt | -rw-r--r-- | 941 bytes |
| mailmap.txt | -rw-r--r-- | 2.4 KB |
| manpage-1.72.xsl | -rw-r--r-- | 510 bytes |
| manpage-base-url.xsl.in | -rw-r--r-- | 320 bytes |
| manpage-base.xsl | -rw-r--r-- | 1.2 KB |
| manpage-bold-literal.xsl | -rw-r--r-- | 578 bytes |
| manpage-normal.xsl | -rw-r--r-- | 475 bytes |
| manpage-quote-apos.xsl | -rw-r--r-- | 585 bytes |
| manpage-suppress-sp.xsl | -rw-r--r-- | 737 bytes |
| merge-config.txt | -rw-r--r-- | 3.5 KB |
| merge-options.txt | -rw-r--r-- | 3.6 KB |
| merge-strategies.txt | -rw-r--r-- | 4.6 KB |
| pretty-formats.txt | -rw-r--r-- | 7.6 KB |
| pretty-options.txt | -rw-r--r-- | 2.8 KB |
| pull-fetch-param.txt | -rw-r--r-- | 3.3 KB |
| rev-list-options.txt | -rw-r--r-- | 27.7 KB |
| revisions.txt | -rw-r--r-- | 11.8 KB |
| sequencer.txt | -rw-r--r-- | 392 bytes |
| urls-remotes.txt | -rw-r--r-- | 2.4 KB |
| urls.txt | -rw-r--r-- | 3.5 KB |
| user-manual.conf | -rw-r--r-- | 432 bytes |
| user-manual.txt | -rw-r--r-- | 170.2 KB |
Computing file changes ...
