mirror of
https://github.com/tpope/vim-fugitive.git
synced 2025-11-17 15:53:43 -05:00
Provide :Git difftool and :Git mergetool
Closes https://github.com/tpope/vim-fugitive/issues/132
This commit is contained in:
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user