VimPlug/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-12-06 12:14:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Always diff against parents in :Gdiffsplit!

Browse Source
This commit is contained in:
Tim Pope
2019-08-14 10:29:59 -04:00
parent 308e4bf241
commit 6eb885c017
2 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
doc/fugitive.txt
View File

@@ -159,12 +159,15 @@ that are part of Git repositories).
Vim's |do| and |dp| to stage and unstage changes.
*fugitive-:Gdiffsplit!*
:Gdiffsplit! [object] During a merge conflict, do a three-way diff against
both ancestors. Additional d2o and d3o maps are
:Gdiffsplit! Diff against any and all direct ancestors, retaining
focus on the current window. During a merge conflict,
this is a three-way diff against the "ours" and
"theirs" ancestors. Additional d2o and d3o maps are
provided to to obtain the hunk from the "ours" or
"theirs" ancestor, respectively. If the file is not
conflicted, behaves the same as if no bang was given,
but keeps focus in the original window.
"theirs" ancestor, respectively.
:Gdiffsplit! {object} Like |:Gdiffsplit|, but retain focus on the current
window.
*fugitive-:Gvdiffsplit*
:Gvdiffsplit [object] Like |:Gdiffsplit|, but always split vertically.