m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-17 15:53:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Provide :Git difftool and :Git mergetool

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

16
doc/fugitive.txt
View File

@@ -103,9 +103,23 @@ that are part of Git repositories).
:Glgrep[!] [args] |:lgrep|[!] with git-grep as 'grepprg'.
:0Git[!] grep [args]
*:Git-difftool*
:Git[!] difftool [args] Invoke `git diff [args]` and load the changes into the
quickfix list. Each changed hunk gets a separate
quickfix entry unless you pass an option like
--name-only or --name-status. Jumps to the first
change unless [!] is given.
:Git difftool -y [args] Invoke `git diff [args]`, open each changed file in a
new tab, and invoke `:Gdiffsplit` against the
appropriate commit.
*:Git-mergetool*
:Git mergetool [args] Like |:Git-difftool|, but target merge conflicts.
*:Gclog* *:Glog*
:Gclog[!] [args] Use git-log [args] to load the commit history into the
:Glog[!] [args] |quickfix| list. Jump to the first commit unless [!]
:Glog[!] [args] |quickfix| list. Jumps to the first commit unless [!]
is given.
:{range}Gclog[!] [args] Use git-log -L to load previous revisions of the given