Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Newer
Older
100644 77 lines (53 sloc) 2.222 kB
ce8cc47 @kablamo Initial commit
authored
1 vim-ribbon
2 ==========
3
2fe337e @kablamo How to use it.
authored
4 vim-ribbon is a Vim plugin that helps you read through the latest changes to a
5 git repository. This plugin requires
6 [Fugitive](https://github.com/tpope/vim-fugitive).
7
8 How to use it
9 -------------
10
11 **First** mark your place with
12
13 :RibbonSave
14
a1db3f4 @kablamo <code> -> `
authored
15 This will place a tag named __ribbon at origin/master. Basically you are
06df6b6 @kablamo Convert '' to ``
authored
16 bookmarking our current spot with a `ribbon`.
2fe337e @kablamo How to use it.
authored
17
18 **Next**, use Fugitive to pull down the latest changes made by your fellow conspirators from the
19 remote repository.
20
21 :Git pull
22
a1db3f4 @kablamo <code> -> `
authored
23 To review those changes use the following command:
2fe337e @kablamo How to use it.
authored
24
25 :Ribbon
26
27 This will open a window titled 'Ribbon' that looks like this:
28
29 Eric Johnson 6 weeks ago ecf43db
30 Css tweaks.
31 root/html/calculator/realCost.tt
32
33 Eric Johnson 5 weeks ago 9595fa0
34 fix css margin class.
35 root/css/networth.css
36 root/css/style.less
37 root/css/style.less.old
38 root/html/calculator/realCost.tt
39 root/html/fi.tt
40
41 Eric Johnson 4 weeks ago 5ef0fb2
42 Added daysPerYear.
43 lib/Networth/Controller/Calculator.pm
44 lib/Networth/Out/RealCost.pm
45 root/html/calculator/realCost.tt
46
47 You can view the side by side diff of any modified file by putting your cursor
06df6b6 @kablamo Convert '' to ``
authored
48 on that line and typing `d` (for diff). To exit out of the diff and return to
49 the 'Ribbon' window, type `q`.
2fe337e @kablamo How to use it.
authored
50
51 **Finally**, after you have reviewed all the changes, mark your place again with:
52
53 :RibbonSave
54
8e3064a @kablamo .
authored
55 Bonus tips
56 ----------
2fe337e @kablamo How to use it.
authored
57
8e3064a @kablamo .
authored
58 The default colors used in vimdiff look like they were created by crazy clowns.
59 You might like my colorscheme instead:
2fe337e @kablamo How to use it.
authored
60
61 ⚡ mkdir -p ~/.vim/colors/
62 ⚡ wget https://github.com/kablamo/dotfiles/blob/master/links/.vim/colors/iijo.vim -O ~/tmp/iijo.vim
63 ⚡ echo "colorscheme iijo" >> ~/.vimrc
64
65 How to use vimdiff:
a1db3f4 @kablamo <code> -> `
authored
66 - To switch windows type `ctl-w l` and `ctl-w h`. For more help see `:help window-move-cursor`.
67 - To open and close folds type `zo` and `zo`. For more help see `:help fold-commands`.
2fe337e @kablamo How to use it.
authored
68
69 See also
70 --------
71
72 This script was inspired by
73 http://gitready.com/advanced/2011/10/21/ribbon-and-catchup-reading-new-commits.html
74
75 I also wrote [git-ribbon](https://github.com/kablamo/git-ribbon), a little Perl
9a2b171 @kablamo .
authored
76 script that does pretty much the same thing but from the commandline.
Something went wrong with that request. Please try again.