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

Provide checkout --ours/--theirs on X

Browse Source 
Closes https://github.com/tpope/vim-fugitive/issues/954
This commit is contained in:
Tim Pope
2019-02-14 17:06:12 -05:00
parent 74aefa53ac
commit 01b9a645b6
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/fugitive.txt
View File

@@ -259,7 +259,10 @@ u Unstage (reset) the file or hunk under the cursor.
X Discard the change under the cursor. This uses
`checkout` or `clean` under the hood. A command is
echoed that shows how to undo the change. Consult
`:messages` to see it again.
`:messages` to see it again. You can use this during
a merge conflict do discard "our" changes (--theirs)
in the "Unstaged" section or discard "their" changes
(--ours) in the "Staged" section.
*fugitive_=*
= Toggle an inline diff of the file under the cursor.