vim-fugitive

I've been using Fugitive's Gblame recently but don't quite understand what "reblame" does. Can someone describe a little more clearly what these options do: - reblame at commit ~ reblame at [count]th first grandparent P reblame at [count]th parent (like HEAD^[count]) Think of reblame as navigating to a commit and then running blame on your file or git blame <commit> -- <file> - the simplest case. Use the commit in question under your cursor and reblame the file. ~ Is equivalent to running git blame <rev>~[count] -- <file> P Is equivalent to running git blame <rev>^[count] -- <file> For the

I know that :Glog will populate the quickfix list with all the versions of the file in the current buffer and that I can hit <enter> on these to see the file at that particular version, but is there an easy way to see the diff of a particular version with the previous version (to easily see what has changed)? EDIT: What I'm after is seeing each of these changes in a vertical diff in vim: git log -p -- path/to/file.txt . This is what I use: :Gdiff [revision] See :help Gdiff for other options as well (vertical vs horizontal splits, etc). For example: :Gdiff HEAD or if you have a revision number

Fugitive.vim allows me to run git grep commands; unfortunately, the results are not stored in a quickfix-list, so I need to run :cw after a :Ggrep in order to have an easily parseable result list. I would like to type :Ggr "def my_function" instead of: :Ggrep "def my_function" :cw How can I define this :Ggr command in my .vimrc file? EDIT Once the :Ggr command is defined, I can map to git grep on the word under the cursor, which is really awesome: nnoremap <C-F> :Ggr <cword><CR> This works for me: :command -nargs=+ Ggr execute 'silent Ggrep!' <q-args> | cw | redraw! You can use the <args>

By default if you use fugitive.vim 's :Gdiff on a file buffer which is in conflict with git, you will get a three way diff showing HEAD , the working copy (with conflict markers), and the merge . I like to have git config merge.conflictstyle diff3 set, which includes the base (most recent common ancestor of HEAD and merge in the conflict markers. Unfortunately even with diff3 as the conflictstyle in fugitive.vim you still only get 3 panes (no base). Does anyone know how to make show it in another pane? Ideally about the working copy. This comment from Tim Pope seems to provide some clue, but I