diff options
| author | Adam Stankiewicz <sheerun@sher.pl> | 2020-07-26 10:20:08 +0200 |
|---|---|---|
| committer | Adam Stankiewicz <sheerun@sher.pl> | 2020-07-26 10:20:08 +0200 |
| commit | 56121b4e27cb48efb17be55a969b2f0d725266f8 (patch) | |
| tree | 30df0f431705cdb72b2014177ce3f0655287a81c /syntax/git.vim | |
| parent | 9c3c0bc082e0d58d15dc6f24d8a335931417e2f0 (diff) | |
| download | vim-polyglot-56121b4e27cb48efb17be55a969b2f0d725266f8.tar.gz vim-polyglot-56121b4e27cb48efb17be55a969b2f0d725266f8.zip | |
Update
Diffstat (limited to 'syntax/git.vim')
| -rw-r--r-- | syntax/git.vim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/syntax/git.vim b/syntax/git.vim index d2c919ee..142478f8 100644 --- a/syntax/git.vim +++ b/syntax/git.vim @@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1 " Vim syntax file " Language: generic git output " Maintainer: Tim Pope <vimNOSPAM@tpope.org> -" Last Change: 2010 May 21 +" Last Change: 2019 Dec 05 if exists("b:current_syntax") finish @@ -27,9 +27,9 @@ syn region gitDiff start=/^\%(@@ -\)\@=/ end=/^\%(diff --\%(git\|cc\|combined\) syn region gitDiffMerge start=/^\%(diff --\%(cc\|combined\) \)\@=/ end=/^\%(diff --\|$\)\@=/ contains=@gitDiff syn region gitDiffMerge start=/^\%(@@@@* -\)\@=/ end=/^\%(diff --\|$\)\@=/ contains=@gitDiff syn match gitDiffAdded "^ \++.*" contained containedin=gitDiffMerge -syn match gitDiffAdded "{+.*+}" contained containedin=gitDiff +syn match gitDiffAdded "{+[^}]*+}" contained containedin=gitDiff syn match gitDiffRemoved "^ \+-.*" contained containedin=gitDiffMerge -syn match gitDiffRemoved "\[-.*-\]" contained containedin=gitDiff +syn match gitDiffRemoved "\[-[^]]*-\]" contained containedin=gitDiff syn match gitKeyword /^\%(object\|type\|tag\|commit\|tree\|parent\|encoding\)\>/ contained containedin=gitHead nextgroup=gitHash,gitType skipwhite syn match gitKeyword /^\%(tag\>\|ref:\)/ contained containedin=gitHead nextgroup=gitReference skipwhite |