m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-16 07:13:52 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

:Gdiff does a three-way during a conflict

Browse Source
This commit is contained in:
Tim Pope
2009-10-14 23:26:10 -04:00
parent 04b845a4e9
commit b65030cd3b
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
doc/fugitive.txt
View File

@@ -92,9 +92,12 @@ that are part of Git repositories).
the index.
*fugitive-:Gdiff*
:Gdiff [revision] Perform a |vimdiff| the current file against the index
or the given revision. Use |do| and |dp| and write to
the index file to simulate git add -p.
:Gdiff [revision] Perform a |vimdiff| against the current file in the
given revision. With no argument, the version in the
index is used (which means a three-way diff during a
merge conflict, making it a git mergetool
alternative). Use |do| and |dp| and write to the
index file to simulate git add -p.
*fugitive-:Gmove*
:Gmove {destination} Wrapper around git-mv that renames the buffer