Provide :Git difftool and :Git mergetool

Closes https://github.com/tpope/vim-fugitive/issues/132
This commit is contained in:
Tim Pope
2020-01-04 22:34:30 -05:00
parent 2bcf755c6e
commit ddd64fc4c5
3 changed files with 257 additions and 2 deletions

View File

@@ -33,6 +33,9 @@ Use `:Ggrep` to search the work tree (or any arbitrary commit) with
list. Give them a range (e.g., using visual mode and `:'<,'>Gclog`) to
iterate over every change to that portion of the current file.
`:Git mergetool` loads conflicts into the quickfix list. `:Git difftool` does
the same for any arbitrary set of changes.
`:Gread` is a variant of `git checkout -- filename` that operates on the
buffer rather than the filename. This means you can use `u` to undo it
and you never get any warnings about the file changing outside Vim.