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

:Gmerge and :Gpull

Browse Source
This commit is contained in:
Tim Pope
2014-06-25 13:05:14 -04:00
parent 41cdbdcd62
commit 7fb703534a
2 changed files with 129 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
doc/fugitive.txt
View File

@@ -70,6 +70,17 @@ that are part of Git repositories).
git-add and git-reset while a commit message is
pending.
*fugitive-:Gmerge*
:Gmerge [args] Calls git-merge and loads errors and conflicted files
into the quickfix list. Opens a |:Gcommit| style
split window for the commit message if the merge
succeeds. If called during a merge conflict, the
conflicted files from the current index are loaded
into the quickfix list.
*fugitive-:Gpull*
:Gpull [args] Like |:Gmerge|, but for git-pull.
*fugitive-:Ggrep*
:Ggrep [args] |:grep| with git-grep as 'grepprg'.