Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 6248f89

Browse files
committedFeb 5, 2014
Merge remote-tracking branch 'torkale/gitgutter'
merged and updated Changelog and README Conflicts: README.markdown bundles.vim
2 parents 0f992cd + 6ee0514 commit 6248f89

File tree

3 files changed

+37
-0
lines changed

3 files changed

+37
-0
lines changed
 

‎Changelog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
* 2014-02-05
22
- golang syntax support (thanks @torkale)
33
- josemarluedke/vim-rspec - lightweight Rspec runner for Vim
4+
- girblade/vim-gitgutter - it diff in the gutter (sign column) and stages/reverts hunks
45

56
* 2013-08-28
67
- fix startup echo messages redirect

‎README.markdown

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ announcements of new versions, tips, etc.
5252
* [Gundo](#gundo)
5353
* [vim-dispatch](#vim-dispatch)
5454
* [unite.vim](#unite.vim)
55+
* [vim-gitgutter](#gitgutter)
5556
* [Ruby/Rails Support](#ruby)
5657
* [vim-rails](#vim-rails)
5758
* [vim-bundler](#vim-bundler)
@@ -502,6 +503,39 @@ execute it with `@a`.
502503

503504
[unite]: https://github.com/Shougo/unite.vim
504505

506+
* <a name=gitgutter>[Vim Git Gutter](https://github.com/airblade/vim-gitgutter) ([top](#top))
507+
A Vim plugin which shows a git diff in the 'gutter' (sign column).
508+
It shows whether each line has been added, modified, and where lines have been removed.
509+
510+
![screenshot](https://raw.github.com/airblade/vim-gitgutter/master/screenshot.png)
511+
512+
In the screenshot above you can see:
513+
514+
* Line 15 has been modified.
515+
* Lines 21-24 are new.
516+
* A line or lines were removed between lines 25 and 26.
517+
518+
Commands:
519+
520+
* `:GitGutterDisable`
521+
* `:GitGutterEnable`
522+
* `:GitGutterToggle`
523+
* `:GitGutterSignsEnable`
524+
* `:GitGutterSignsDisable`
525+
* `:GitGutterSignsToggle`
526+
* `:GitGutterLineHighlightsEnable`
527+
* `:GitGutterLineHighlightsDisable`
528+
* `:GitGutterLineHighlightsToggle`
529+
530+
Bindings:
531+
532+
* `]c` - jump to next hunk
533+
* `[c` - jump to previous hunk
534+
* `,hs` - stage hunk
535+
* `,hr` - revert hunk
536+
537+
There are quite some customization options. see help.
538+
505539
* <a name=switch>[Switch](https://github.com/AndrewRadev/switch.vim) ([top](#top))
506540

507541
A plugin to switch segments of text with predefined replacements

‎bundles.vim

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ Bundle 'sjl/gundo.vim'
6060
Bundle 'AndrewRadev/switch.vim'
6161
" async external commands with output in vim
6262
Bundle 'tpope/vim-dispatch'
63+
" git diff in the gutter (sign column) and stages/reverts hunks
64+
Bundle 'airblade/vim-gitgutter'
6365

6466
" Ruby/Rails
6567

0 commit comments

Comments
 (0)
Please sign in to comment.