Provide :Git difftool and :Git mergetool

References https://github.com/tpope/vim-fugitive/issues/132
Run QuickFix autocommands on :Gclog
2026-04-27 01:20:23 +08:00 · 2020-01-05 16:36:11 -05:00 · 2020-01-05 16:36:11 -05:00 · 2020-01-05 16:17:58 -05:00 · 2020-01-05 01:50:24 -05:00 · 2020-01-05 01:50:24 -05:00
10 changed files with 7384 additions and 3143 deletions
@@ -0,0 +1,2 @@
 .git* export-ignore
 *.markdown export-ignore
@@ -0,0 +1,2 @@
 github: tpope
 custom: ["https://www.paypal.me/vimpope"]
@@ -8,8 +8,14 @@ platform issues, and interactions with other plugins.  I end up bisecting a
 lot more than other projects, and thus I'm especially meticulous here about
 maintaining a clean, readable, history.  Squash and force push any requested
 changes to a pull request.  And if your [commit message
-sucks](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html),
+sucks](https://commit.style), I'm not going to accept it.  Period.
-I'm not going to accept it.  Period.
+
 If your contribution involves adding a configuration option, you are going to
 need a very compelling justification for it.  Options add a maintenance
 burden, support burden, and documentation bloat, and oftentimes can be
 achieved much more simply with a custom map or autocommand.  If your option
 controls an underlying Git command, ask yourself why Git itself does not offer
 such configuration.
 Beyond that, don't be shy about asking before patching.  What takes you hours
 might take me minutes simply because I have both domain knowledge and a
@@ -3,16 +3,20 @@
 I'm not going to lie to you; fugitive.vim may very well be the best
 Git wrapper of all time.  Check out these features:
 Bring up an enhanced version of `git status` with `:G` (also known as
 `:Gstatus`).  Press `g?` to bring up a list of maps for numerous operations
 including diffing, staging, committing, rebasing, and stashing.
 View any blob, tree, commit, or tag in the repository with `:Gedit` (and
 `:Gsplit`, `:Gvsplit`, `:Gtabedit`, ...).  Edit a file in the index and
-write to it to stage the changes.  Use `:Gdiff` to bring up the staged
+write to it to stage the changes.  Use `:Gdiffsplit` to bring up the staged
 version of the file side by side with the working tree version and use
 Vim's diff handling capabilities to stage a subset of the file's
 changes.
-Bring up the output of `git status` with `:Gstatus`.  Press `-` to
+Commit, merge, and rebase with `:Gcommit`, `:Gmerge`, and `:Grebase`, using
-`add`/`reset` a file's changes, or `p` to `add`/`reset` `--patch`.  And guess
+the current Vim instance to edit commit messages and the rebase todo list.
-what `:Gcommit` does!
+Use `:Gpush`, `:Gfetch`, and `:Gpull` to send and retrieve upstream changes.
 `:Gblame` brings up an interactive vertical split with `git blame`
 output.  Press enter on a line to edit the commit where the line
@@ -20,13 +24,14 @@ changed, or `o` to open it in a split.  When you're done, use `:Gedit`
 in the historic buffer to go back to the work tree version.
 `:Gmove` does a `git mv` on a file and simultaneously renames the
-buffer.  `:Gremove` does a `git rm` on a file and simultaneously deletes
+buffer.  `:Gdelete` does a `git rm` on a file and simultaneously deletes
 the buffer.
 Use `:Ggrep` to search the work tree (or any arbitrary commit) with
 `git grep`, skipping over that which is not tracked in the repository.
-`:Glog` loads all previous revisions of a file into the quickfix list so
+`:Gclog` and `:Gllog` load all previous commits into the quickfix or location
-you can iterate over them and watch the file evolve!
+list.  Give them a range (e.g., using visual mode and `:'<,'>Gclog`) to
 iterate over every change to that portion of the current file.
 `:Gread` is a variant of `git checkout -- filename` that operates on the
 buffer rather than the filename.  This means you can use `u` to undo it
@@ -35,15 +40,26 @@ and you never get any warnings about the file changing outside Vim.
 making it like `git add` when called from a work tree file and like
 `git checkout` when called from the index or a blob in history.
-Use `:Gbrowse` to open the current file on GitHub, with optional line
+Use `:Gbrowse` to open the current file on the web front-end of your favorite
-range (try it in visual mode!).  If your current repository isn't on
+hosting provider, with optional line range (try it in visual mode).  Plugins
-GitHub, `git instaweb` will be spun up instead.
+are available for popular providers such as [GitHub][rhubarb.vim],
 [GitLab][fugitive-gitlab.vim], [Bitbucket][fubitive.vim],
 [Gitee][fugitive-gitee.vim], [Pagure][pagure], and
 [Phabricator][vim-phabricator].
-Add `%{fugitive#statusline()}` to `'statusline'` to get an indicator
+[rhubarb.vim]: https://github.com/tpope/vim-rhubarb
-with the current branch in (surprise!) your statusline.
+[fugitive-gitlab.vim]: https://github.com/shumphrey/fugitive-gitlab.vim
 [fubitive.vim]: https://github.com/tommcdo/vim-fubitive
 [fugitive-gitee.vim]: https://github.com/linuxsuren/fugitive-gitee.vim
 [pagure]: https://github.com/FrostyX/vim-fugitive-pagure
 [vim-phabricator]: https://github.com/jparise/vim-phabricator
-Last but not least, there's `:Git` for running any arbitrary command,
+Add `%{FugitiveStatusline()}` to `'statusline'` to get an indicator
-and `Git!` to open the output of a command in a temp file.
+with the current branch in your statusline.
 Last but not least, there's `:Git` for running any arbitrary command.
 For more information, see `:help fugitive`.
 ## Screencasts
@@ -55,53 +71,29 @@ and `Git!` to open the output of a command in a temp file.
 ## Installation
-If you don't have a preferred installation method, one option is to install
+Install using your favorite package manager, or use Vim's built-in package support:
 [pathogen.vim](https://github.com/tpope/vim-pathogen), and then copy
 and paste:
-    cd ~/.vim/bundle
+    mkdir -p ~/.vim/pack/tpope/start
-    git clone git://github.com/tpope/vim-fugitive.git
+    cd ~/.vim/pack/tpope/start
-    vim -u NONE -c "helptags vim-fugitive/doc" -c q
+    git clone https://tpope.io/vim/fugitive.git
-
+    vim -u NONE -c "helptags fugitive/doc" -c q
 If your Vim version is below 7.2, I recommend also installing
 [vim-git](https://github.com/tpope/vim-git) for syntax highlighting and
 other Git niceties.
 ## FAQ
-> I installed the plugin and started Vim.  Why don't any of the commands
+> Why can't I enter my password when I `:Gpush`?
 > exist?
-Fugitive cares about the current file, not the current working
+It is highly recommended to use SSH keys or [credentials caching][] to avoid
-directory.  Edit a file from the repository.
+entering your password on every upstream interaction.  If this isn't an
 option, the official solution is to use the `core.askPass` Git option to
 request the password via a GUI.  Fugitive will configure this for you
 automatically if you have `ssh-askpass` or `git-gui` installed; otherwise it's
 your responsibility to set this up.
-> I opened a new tab.  Why don't any of the commands exist?
+As an absolute last resort, you can invoke `:Git --paginate push`.  Fugitive
 recognizes the pagination request and fires up a `:terminal`, which allows for
 interactive password entry.
-Fugitive cares about the current file, not the current working
+[credentials caching]: https://help.github.com/en/articles/caching-your-github-password-in-git
 directory.  Edit a file from the repository.
 > Why is `:Gbrowse` not using the right browser?
 `:Gbrowse` delegates to `git web--browse`, which is less than perfect
 when it comes to finding the right browser.  You can tell it the correct
 browser to use with `git config --global web.browser ...`.  On OS X, for
 example, you might want to set this to `open`.  See `git web--browse --help`
 for details.
 > Here's a patch that automatically opens the quickfix window after
 > `:Ggrep`.
 This is a great example of why I recommend asking before patching.
 There are valid arguments to be made both for and against automatically
 opening the quickfix window.  Whenever I have to make an arbitrary
 decision like this, I ask what Vim would do.  And Vim does not open a
 quickfix window after `:grep`.
 Luckily, it's easy to implement the desired behavior without changing
 fugitive.vim.  The following autocommand will cause the quickfix window
 to open after any grep invocation:
    autocmd QuickFixCmdPost *grep* cwindow
 ## Self-Promotion
@@ -15,140 +15,166 @@ COMMANDS                                        *fugitive-commands*
 These commands are local to the buffers in which they work (generally, buffers
 that are part of Git repositories).
-                                                *fugitive-:Git*
+                                                *:Git* *fugitive-:G*
-:Git [args]             Run an arbitrary git command. Similar to :!git [args]
+:Git {args}             Run an arbitrary git command. Similar to :!git [args]
-                        but chdir to the repository tree first.
+:G {args}               but chdir to the repository tree first.  For some
                        subcommands, a Fugitive command is called instead.
-                                                *fugitive-:Git!*
+                                                *:Git!*
-:Git! [args]            Like |:Git|, but capture the output into a temp file,
+:Git! {args}            Like |:Git|, but capture the output into a temp file,
-                        and edit that temp file.
+:Git --no-pager {args}  and |:split| that temp file.  Use :0Git to
 :Git -P {args}          |:edit| the temp file instead.  A temp file is always
                        used for diff and log commands.
-                                                *fugitive-:Gcd*
+                                                *:Gstatus*
-:Gcd [directory]        |:cd| relative to the repository.
+:Git                    Bring up a summary window vaguely akin to git-status.
 :G                      Press g? or see |fugitive-maps| for usage.
 :Gstatus
-                                                *fugitive-:Glcd*
+                                                *:Git-commit* *:Gcommit*
-:Glcd [directory]       |:lcd| relative to the repository.
+:Git commit [args]      A wrapper around git-commit.  Unless the arguments
 :Gcommit [args]         given would skip the invocation of an editor (e.g.,
                        -m), a split window will be used to obtain a commit
                        message, or a new tab if -v is given.  Write and close
                        the window (:wq) to finish the commit. To cancel, use
                        an empty message.
-                                                *fugitive-:Gstatus*
+                                                *:Git-revert* *:Grevert*
-:Gstatus                Bring up the output of git-status in the preview
+:Git revert [args]      A wrapper around git-revert.  Similar to |:Gcommit|.
-                        window.  The following maps, which work on the cursor
+:Grevert [args]
                        line file where sensible, are provided:
-                        g?    show this help
+                                                *:Git-merge* *:Gmerge*
-                        <C-N> next file
+:Git merge [args]       Calls git-merge and loads errors and conflicted files
-                        <C-P> previous file
+:Gmerge [args]          into the |quickfix| list.  Opens a |:Gcommit| style
                        <CR>  |:Gedit|
                        -     |:Git| add
                        -     |:Git| reset (staged files)
                        cA    |:Gcommit| --amend --reuse-message=HEAD
                        ca    |:Gcommit| --amend
                        cc    |:Gcommit|
                        cva   |:Gcommit| --amend --verbose
                        cvc   |:Gcommit| --verbose
                        D     |:Gdiff|
                        ds    |:Gsdiff|
                        dp    |:Git!| diff (p for patch; use :Gw to apply)
                        dp    |:Git| add --intent-to-add (untracked files)
                        dv    |:Gvdiff|
                        O     |:Gtabedit|
                        o     |:Gsplit|
                        p     |:Git| add --patch
                        p     |:Git| reset --patch (staged files)
                        q     close status
                        r     reload status
                        S     |:Gvsplit|
                                                *fugitive-:Gcommit*
 :Gcommit [args]         A wrapper around git-commit.  If there is nothing
                        to commit, |:Gstatus| is called instead.  Unless the
                        arguments given would skip the invocation of an editor
                        (e.g., -m), a split window will be used to obtain a
                        commit message, or a new tab if -v is given.  Write
                        and close that window (:wq or |:Gwrite|) to finish the
                        commit.  Unlike when running the actual git-commit
                        command, it is possible (but unadvisable) to alter the
                        index with commands like 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.
+                        into the |quickfix| list.
-                                                *fugitive-:Gpull*
+                                                *:Git-pull* *:Gpull*
-:Gpull [args]           Like |:Gmerge|, but for git-pull.
+:Git pull [args]        Like |:Gmerge|, but for git-pull.
 :Gpull [args]
-                                                *fugitive-:Gpush*
+                                                *:Git-rebase* *:Grebase*
-:Gpush [args]           Invoke git-push, load the results into the quickfix
+:Git rebase [args]      Like |:Gmerge|, but for git-rebase.  Interactive
-                        list, and invoke |:cwindow| to reveal any errors.
+:Grebase [args]         rebase is experimentally supported.
                                                *:Git-push* *:Gpush*
 :Git push [args]        Invoke git-push, load the results into the |quickfix|
 :Gpush [args]           list, and invoke |:cwindow| to reveal any errors.
                        |:Dispatch| is used if available for asynchronous
                        invocation.
-                                                *fugitive-:Gfetch*
+                                                *:Git-fetch* *:Gfetch*
-:Gfetch [args]          Like |:Gpush|, but for git-fetch.
+:Git fetch [args]       Like |:Gpush|, but for git-fetch.
 :Gfetch [args]
-                                                *fugitive-:Ggrep*
+                                                *:Git-blame* *:Gblame*
-:Ggrep [args]           |:grep| with git-grep as 'grepprg'.
+:Git blame [flags]      Run git-blame [flags] on the current file and open the
 :Gblame [flags]         results in a scroll-bound vertical split.  The
                        following maps, which work on the cursor line commit
                        where sensible, are provided:
-                                                *fugitive-:Glgrep*
+                        g?    show this help
-:Glgrep [args]          |:lgrep| with git-grep as 'grepprg'.
+                        A     resize to end of author column
                        C     resize to end of commit column
                        D     resize to end of date/time column
                        gq    close blame, then |:Gedit| to return to work
                              tree version
                        <CR>  close blame, and jump to patch that added line
                              (or directly to blob for boundary commit)
                        o     jump to patch or blob in horizontal split
                        O     jump to patch or blob in new tab
                        p     jump to patch or blob in preview window
                        -     reblame at commit
                        ~     reblame at [count]th first grandparent
                        P     reblame at [count]th parent (like HEAD^[count])
-                                                *fugitive-:Glog*
+:[range]Gblame [flags]  If a range is given, just that part of the file will
-:Glog [args]            Load all previous revisions of the current file into
+:Gblame [flags] {file}  be blamed, and a horizontal split without
-                        the quickfix list.  Additional git-log arguments can
+:Git blame ...          scrollbinding is used.  You can also give an arbitrary
-                        be given (for example, --reverse).  If "--" appears as
+                        filename.
                        an argument, no file specific filtering is done, and
                        previous commits rather than previous file revisions
                        are loaded.
-:{range}Glog [args]     Use git-log -L to load previous revisions of the given
+                                                *:Ggrep* *:Gcgrep* *:Git-grep*
-                        range of the current file into the quickfix list.  The
+:Ggrep[!] [args]        |:grep|[!] with git-grep as 'grepprg'.
-                        cursor is positioned on the first line of the first
+:Git[!] grep [args]
                        diff hunk for each commit.
-                                                *fugitive-:Gllog*
+                                                *:Glgrep*
-:Gllog [args]           Like |:Glog|, but use the location list instead of the
+:Glgrep[!] [args]       |:lgrep|[!] with git-grep as 'grepprg'.
-                        quickfix list.
+:0Git[!] grep [args]
-                                        *fugitive-:Gedit* *fugitive-:Ge*
+                                                *:Git-difftool*
-:Gedit [revision]       |:edit| a |fugitive-revision|.
+: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.
-                                                *fugitive-:Gsplit*
+:Git difftool -y [args] Invoke `git diff [args]`, open each changed file in a
-:Gsplit [revision]      |:split| a |fugitive-revision|.
+                        new tab, and invoke `:Gdiffsplit` against the
                        appropriate commit.
-                                                *fugitive-:Gvsplit*
+                                                *:Git-mergetool*
-:Gvsplit [revision]     |:vsplit| a |fugitive-revision|.
+:Git mergetool [args]   Like |:Git-difftool|, but target merge conflicts.
-                                                *fugitive-:Gtabedit*
+                                                 *:Gclog* *:Glog*
-:Gtabedit [revision]    |:tabedit| a |fugitive-revision|.
+:Gclog[!] [args]        Use git-log [args] to load the commit history into the
 :Glog[!] [args]         |quickfix| list.  Jumps to the first commit unless [!]
                        is given.
-                                                *fugitive-:Gpedit*
+:{range}Gclog[!] [args] Use git-log -L to load previous revisions of the given
-:Gpedit [revision]      |:pedit| a |fugitive-revision|.
+                        range of the current file into the |quickfix| list.
                        The cursor is positioned on the first line of the
                        first diff hunk for each commit.  Use :0Gclog to
                        target the entire file.
-:Gsplit! [args]                 *fugitive-:Gsplit!* *fugitive-:Gvsplit!*
+                                                *:Gllog*
-:Gvsplit! [args]                *fugitive-:Gtabedit!* *fugitive-:Gpedit!*
+:Gllog [args]           Like |:Gclog|, but use the location list instead of the
-:Gtabedit! [args]       Like |:Git!|, but open the resulting temp file in a
+                        |quickfix| list.
 :Gpedit! [args]         split, tab, or preview window.
-                                                *fugitive-:Gread*
+                                                *:Gcd*
-:Gread [revision]       Empty the buffer and |:read| a |fugitive-revision|.
+:Gcd [directory]        |:cd| relative to the repository.
                                                *:Glcd*
 :Glcd [directory]       |:lcd| relative to the repository.
                                                *:Gedit* *fugitive-:Ge*
 :Gedit [object]         |:edit| a |fugitive-object|.
                                                *:Gsplit*
 :Gsplit [object]        |:split| a |fugitive-object|.
                                                *:Gvsplit*
 :Gvsplit [object]       |:vsplit| a |fugitive-object|.
                                                *:Gtabedit*
 :Gtabedit [object]      |:tabedit| a |fugitive-object|.
                                                *:Gpedit*
 :Gpedit [object]        |:pedit| a |fugitive-object|.
 :Gsplit! [args]                                 *:Gsplit!* *:Gvsplit!*
 :Gvsplit! [args]                                *:Gtabedit!* *:Gpedit!*
 :Gtabedit! [args]       Capture the output of `git [args]` to a temp file and
 :Gpedit! [args]         open it in a split, tab, or preview window.  Use
                        :0Gsplit! to suppress the split and open it in the
                        current window.
                                                *:Gread* *fugitive-:Gr*
 :Gread [object]         Empty the buffer and |:read| a |fugitive-object|.
                        When the argument is omitted, this is similar to
                        git-checkout on a work tree file or git-add on a stage
                        file, but without writing anything to disk.
-:{range}Gread [revision]
+:{range}Gread [object]  |:read| in a |fugitive-object| after {range}.
                        |:read| in a |fugitive-revision| after {range}.
-                                                *fugitive-:Gread!*
+                                                *:Gread!* *fugitive-:Gr!*
 :Gread! [args]          Empty the buffer and |:read| the output of a Git
                        command.  For example, :Gread! show HEAD:%.
-:{range}Gread! [args]  |:read| the output of a Git command after {range}.
+:{range}Gread! [args]   |:read| the output of a Git command after {range}.
-                                        *fugitive-:Gw* *fugitive-:Gwrite*
+                                                *:Gwrite* *fugitive-:Gw*
 :Gwrite                 Write to the current file's path and stage the results.
                        When run in a work tree file, it is effectively git
                        add.  Elsewhere, it is effectively git-checkout.  A
@@ -158,181 +184,454 @@ that are part of Git repositories).
 :Gwrite {path}          You can give |:Gwrite| an explicit path of where in
                        the work tree to write.  You can also give a path like
-                        :0:foo.txt or even :0 to write to just that stage in
+                        :0:foo.txt or :0:% to write to just that stage in
                        the index.
-                                                *fugitive-:Gwq*
+                                                *:Gwq*
 :Gwq [path]             Like |:Gwrite| followed by |:quit| if the write
                        succeeded.
 :Gwq! [path]            Like |:Gwrite|! followed by |:quit|! if the write
                        succeeded.
-                                                *fugitive-:Gdiff*
+                                                *:Gdiffsplit*
-:Gdiff [revision]       Perform a |vimdiff| against the current file in the
+:Gdiffsplit [object]    Perform a |vimdiff| against the given file, or if a
-                        given revision.  With no argument, the version in the
+                        commit is given, the current file in that commit.
-                        index is used (which means a three-way diff during a
+                        With no argument, the version in the index or work
-                        merge conflict, making it a git-mergetool
+                        tree is used.  The newer of the two files is placed to
-                        alternative).  The newer of the two files is placed
+                        the right or bottom, depending on 'diffopt' and the
-                        to the right or bottom, depending on 'diffopt' and
+                        width of the window relative to 'textwidth'.  Use
-                        the width of the window relative to 'textwidth'.  Use
+                        Vim's |do| and |dp| to stage and unstage changes.
                        |do| and |dp| and write to the index file to simulate
                        "git add --patch".
-                                                *fugitive-:Gsdiff*
+                                                *:Gdiffsplit!*
-:Gsdiff [revision]      Like |:Gdiff|, but always split horizontally.
+: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.
-                                                *fugitive-:Gvdiff*
+:Gdiffsplit! {object}   Like |:Gdiffsplit|, but retain focus on the current
-:Gvdiff [revision]      Like |:Gdiff|, but always split vertically.
+                        window.
-                                                *fugitive-:Gmove*
+                                                *:Gvdiffsplit*
 :Gvdiffsplit [object]   Like |:Gdiffsplit|, but always split vertically.
                                *:Ghdiffsplit* *:Gsdiff*
 :Ghdiffsplit [object]   Like |:Gdiffsplit|, but always split horizontally.
                                                *:Gmove*
 :Gmove {destination}    Wrapper around git-mv that renames the buffer
-                        afterward.  The destination is relative to the current
+                        afterward.  Add a ! to pass -f.
                        directory except when started with a /, in which case
                        it is relative to the work tree.  Add a ! to pass -f.
-                                                *fugitive-:Gremove*
+                                                *:Grename*
-:Gremove                Wrapper around git-rm that deletes the buffer
+:Grename {destination}  Like |:Gmove| but operates relative to the parent
                        directory of the current file.
                                                *:Gdelete*
 :Gdelete                Wrapper around git-rm that deletes the buffer
                        afterward.  When invoked in an index file, --cached is
                        passed.  Add a ! to pass -f and forcefully discard the
                        buffer.
-                                                *fugitive-:Gblame*
+                                                *:Gremove*
-:Gblame [flags]         Run git-blame on the file and open the results in a
+:Gremove                Like :Gdelete, but keep the (now empty) buffer around.
                        scroll bound vertical split.  You can give any of
                        ltfnsewMC as flags and they will be passed along to
                        git-blame.  The following maps, which work on the
                        cursor line commit where sensible, are provided:
-                        g?    show this help
+                                                *:Gbrowse*
-                        A     resize to end of author column
+:Gbrowse                Open the current file, blob, tree, commit, or tag
-                        C     resize to end of commit column
+                        in your browser at the upstream hosting provider.
-                        D     resize to end of date/time column
+                        If a range is given, it is appropriately appended to
-                        q     close blame and return to blamed window
+                        the URL as an anchor.
                        gq    q, then |:Gedit| to return to work tree version
                        <CR>  q, then open commit
                        o     open commit in horizontal split
                        O     open commit in new tab
                        -     reblame at commit
                        ~     reblame at [count]th first grandparent
                        P     reblame at [count]th parent (like HEAD^[count])
-:[range]Gblame [flags]  Run git-blame on the given range.
+                        Upstream providers can be added by installing an
                        appropriate Vim plugin.  For example, GitHub can be
                        supported by installing rhubarb.vim, available at
                        <https://github.com/tpope/vim-rhubarb>.
-                                                *fugitive-:Gbrowse*
+:Gbrowse {object}       Like :Gbrowse, but for a given |fugitive-object|.
 :[range]Gbrowse         If the remote for the current branch is on GitHub,
                        open the current file, blob, tree, commit, or tag
                        (with git-web--browse) on GitHub.  Otherwise, open the
                        current file, blob, tree, commit, or tag in
                        git-instaweb (if you have issues, verify you can run
                        "git instaweb" from a terminal).  If a range is given,
                        it is appropriately appended to the URL as an anchor.
-                        To use with GitHub FI, point g:fugitive_github_domains
+:Gbrowse [...]@{remote} Force using the given remote rather than the remote
-                        at a list of domains:
+                        for the current branch.  The remote is used to
->
+                        determine which upstream repository to link to.
-                        let g:fugitive_github_domains = ['https://example.com']
+
-~
+:{range}Gbrowse [args]  Appends an anchor to the URL that emphasizes the
-:[range]Gbrowse!        Like :Gbrowse, but put the URL on the clipboard rather
+                        selected lines. This also forces the URL to include a
                        commit rather than a branch name so it remains valid
                        if the file changes.  You can give a range of "0" to
                        force this behavior without including an anchor.
 :[range]Gbrowse! [args] Like :Gbrowse, but put the URL on the clipboard rather
                        than opening it.
-:[range]Gbrowse {revision}
+MAPS                                            *fugitive-maps*
                        Like :Gbrowse, but for a given |fugitive-revision|.  A
                        useful value here is -, which ties the URL to the
                        latest commit rather than a volatile branch.
-:[range]Gbrowse [...]@{remote}
+These maps are available in both the |:Gstatus| buffer and Fugitive object
-                        Force using the given remote rather than the remote
+buffers, although not all maps make sense in all buffers.  Mappings that
-                        for the current branch.  The remote is used to
+operate on the file or hunk under the cursor are generally available in visual
-                        determine which GitHub repository to link to.
+mode to operate on multiple files or partial hunks.
-MAPPINGS                                        *fugitive-mappings*
+                                                *fugitive-staging-maps*
 Staging/unstaging maps ~
-These maps are available everywhere.
+                                                *fugitive_s*
 s                       Stage (add) the file or hunk under the cursor.
-                                                *fugitive-c_CTRL-R_CTRL-G*
+                                                *fugitive_u*
 u                       Unstage (reset) the file or hunk under the cursor.
                                                *fugitive_-*
 -                       Stage or unstage the file or hunk under the cursor.
                                                *fugitive_U*
 U                       Unstage everything.
                                                *fugitive_X*
 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.  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.
                                                *fugitive_>*
 >                       Insert an inline diff of the file under the cursor.
                                                *fugitive_<*
 <                       Remove the inline diff of the file under the cursor.
                                                *fugitive_gI*
 gI                      Open .git/info/exclude in a split and add the file
                        under the cursor.  Use a count to open .gitignore.
                                                *fugitive_I*
 I                       Invoke |:Git| add --patch or reset --patch on the file
 P                       under the cursor. On untracked files, this instead
                        calls |:Git| add --intent-to-add.
                                                *fugitive_d*
 Diff maps ~
                                                *fugitive_dp*
 dp                      Invoke |:Git!| diff on the file under the cursor.
                        Deprecated in favor of inline diffs.
                                                *fugitive_dd*
 dd                      Perform a |:Gdiffsplit| on the file under the cursor.
                                                *fugitive_dv*
 dv                      Perform a |:Gvdiffsplit| on the file under the cursor.
                                                *fugitive_ds* *fugitive_dh*
 ds                      Perform a |:Ghdiffsplit| on the file under the cursor.
 dh
                                                *fugitive_dq*
 dq                      Close all but one diff buffer, and |:diffoff|! the
                        last one.
                                                *fugitive_d?*
 d?                      Show this help.
                                                *fugitive-navigation-maps*
 Navigation maps ~
                                                *fugitive_<CR>*
 <CR>                    Open the file or |fugitive-object| under the cursor.
                        in a blob, this and similar maps jump to the patch
                        from the diff where this was added, or where it was
                        removed if a count was given.  If the line is still in
                        the work tree version, passing a count takes you to
                        it.
                                                *fugitive_o*
 o                       Open the file or |fugitive-object| under the cursor in
                        a new split.
                                                *fugitive_gO*
 gO                      Open the file or |fugitive-object| under the cursor in
                        a new vertical split.
                                                *fugitive_O*
 O                       Open the file or |fugitive-object| under the cursor in
                        a new tab.
                                                *fugitive_p*
 p                       Open the file or |fugitive-object| under the cursor in
                        a preview window.  In the status buffer, 1p is
                        required to bypass the legacy usage instructions.
                                                *fugitive_~*
 ~                       Open the current file in the [count]th first ancestor.
                                                *fugitive_P*
 P                       Open the current file in the [count]th parent.
                                                *fugitive_C*
 C                       Open the commit containing the current file.
                                                *fugitive_CTRL-P* *fugitive_(*
 (                       Jump to the previous file, hunk, or revision.
                                                *fugitive_CTRL-N* *fugitive_)*
 )                       Jump to the next file, hunk, or revision.
                                                *fugitive_[c*
 [c                      Jump to previous hunk, expanding inline diffs
                        automatically.  (This shadows the Vim built-in |[c|
                        that provides a similar operation in |diff| mode.)
                                                *fugitive_]c*
 ]c                      Jump to next hunk, expanding inline diffs
                        automatically.  (This shadows the Vim built-in |]c|
                        that provides a similar operation in |diff| mode.)
                                                *fugitive_[/* *fugitive_[m*
 [/                      Jump to previous file, collapsing inline diffs
 [m                      automatically.  (Mnemonic: "/" appears in filenames,
                        "m" appears in "filenames".)
                                                *fugitive_]/* *fugitive_]m*
 ]/                      Jump to next file, collapsing inline diffs
 ]m                      automatically.  (Mnemonic: "/" appears in filenames,
                        "m" appears in "filenames".)
                                                *fugitive_i*
 i                       Jump to the next file or hunk, expanding inline diffs
                        automatically.
                                                *fugitive_[[*
 [[                      Jump [count] sections backward.
                                                *fugitive_]]*
 ]]                      Jump [count] sections forward.
                                                *fugitive_[]*
 []                      Jump [count] section ends backward.
                                                *fugitive_][*
 ][                      Jump [count] section ends forward.
                                                *fugitive_star*
 *                       One the first column of a + or - diff line, search for
                        the corresponding - or + line.  Otherwise, defer to
                        built-in |star|.
                                                *fugitive_#*
 #                       Same as "*", but search backward.
                                                *fugitive_gu*
 gu                      Jump to file [count] in the "Untracked" or "Unstaged"
                        section.
                                                *fugitive_gU*
 gU                      Jump to file [count] in the "Unstaged" section.
                                                *fugitive_gs*
 gs                      Jump to file [count] in the "Staged" section.
                                                *fugitive_gp*
 gp                      Jump to file [count] in the "Unpushed" section.
                                                *fugitive_gP*
 gP                      Jump to file [count] in the "Unpulled" section.
                                                *fugitive_gr*
 gr                      Jump to file [count] in the "Rebasing" section.
                                                *fugitive_gi*
 gi                      Open .git/info/exclude in a split.  Use a count to
                        open .gitignore.
                                                *fugitive_c*
 Commit maps ~
 cc                      Create a commit.
 ca                      Amend the last commit and edit the message.
 ce                      Amend the last commit without editing the message.
 cw                      Reword the last commit.
 cvc                     Create a commit with -v.
 cva                     Amend the last commit with -v
 cf                      Create a `fixup!` commit for the commit under the
                        cursor.
 cF                      Create a `fixup!` commit for the commit under the
                        cursor and immediately rebase it.
 cs                      Create a `squash!` commit for the commit under the
                        cursor.
 cS                      Create a `squash!` commit for the commit under the
                        cursor and immediately rebase it.
 cA                      Create a `squash!` commit for the commit under the
                        cursor and edit the message.
 c<Space>                Populate command line with ":Git commit ".
                                                *fugitive_cr*
 crc                     Revert the commit under the cursor.
 crn                     Revert the commit under the cursor in the index and
                        work tree, but do not actually commit the changes.
 cr<Space>               Populate command line with ":Git revert ".
                                                *fugitive_cm*
 cm<Space>               Populate command line with ":Git merge ".
 c?                      Show this help.
                                                *fugitive_cb*
                                                *fugitive_co*
 Checkout/branch maps ~
 coo                     Check out the commit under the cursor.
 cb<Space>               Populate command line with ":Git branch ".
 co<Space>               Populate command line with ":Git checkout ".
 cb?                     Show this help.
 co?
                                                *fugitive_cz*
 Stash maps ~
 czz                     Push stash.  Pass a [count] of 1 to add
                        `--include-untracked` or 2 to add `--all`.
 czw                     Push stash of worktree.  Like `czz` with
                        `--include-index`.
 czA                     Apply topmost stash, or stash@{count}.
 cza                     Apply topmost stash, or stash@{count}, preserving the
                        index.
 czP                     Pop topmost stash, or stash@{count}.
 czp                     Pop topmost stash, or stash@{count}, preserving the
                        index.
 cz<Space>               Populate command line with ":Git stash ".
 cz?                     Show this help.
                                                *fugitive_r*
 Rebase maps ~
 ri                      Perform an interactive rebase.  Uses ancestor of
 u                       commit under cursor as upstream if available.
 rf                      Perform an autosquash rebase without editing the todo
                        list.  Uses ancestor of commit under cursor as
                        upstream if available.
 ru                      Perform an interactive rebase against @{upstream}.
 rp                      Perform an interactive rebase against @{push}.
 rr                      Continue the current rebase.
 rs                      Skip the current commit and continue the current
                        rebase.
 ra                      Abort the current rebase.
 re                      Edit the current rebase todo list.
 rw                      Perform an interactive rebase with the commit under
                        the cursor set to `reword`.
 rm                      Perform an interactive rebase with the commit under
                        the cursor set to `edit`.
 rd                      Perform an interactive rebase with the commit under
                        the cursor set to `drop`.
 r<Space>                Populate command line with ":Git rebase ".
 r?                      Show this help.
                                                *fugitive-misc-maps*
 Miscellaneous maps ~
                                                *fugitive_gq* *fugitive_q*
 gq                      Close the status buffer.
                                                *fugitive_.*
 .                       Start a |:| command line with the file under the
                        cursor prepopulated.
                                                *fugitive_g?*
 g?                      Show help for |fugitive-maps|.
                                                *fugitive-global-maps*
 Global maps ~
                                                *fugitive_c_CTRL-R_CTRL-G*
 <C-R><C-G>              On the command line, recall the path to the current
-                        object (that is, a representation of the object
+                        |fugitive-object| (that is, a representation of the
-                        recognized by |:Gedit|).
+                        object recognized by |:Gedit|).
-                                                *fugitive-y_CTRL-G*
+                                                *fugitive_y_CTRL-G*
-["x]y<C-G>              Yank the commit SHA and path to the current object.
+["x]y<C-G>              Yank the path to the current |fugitive-object|.
-These maps are available in Git objects.
+                                                *g:fugitive_no_maps*
 Global maps can be disabled with the g:fugitive_no_maps option.
 >
        let g:fugitive_no_maps = 1
 <
 SPECIFYING OBJECTS                      *fugitive-object* *fugitive-revision*
-                                                *fugitive-<CR>*
+Fugitive objects are either work tree files or Git revisions as defined in the
-<CR>                    Jump to the revision under the cursor.
+"SPECIFYING REVISIONS" section in the git-rev-parse man page, with expansions
 inspired by |cmdline-special| layered on top.  For commands that accept an
 optional object, the default is the file in the index for work tree files and
 the work tree file for everything else.  Example objects follow.
-                                                *fugitive-o*
+Object          Meaning ~
-o                       Jump to the revision under the cursor in a new split.
+@               The commit referenced by @ aka HEAD
-
+master          The commit referenced by master
-                                                *fugitive-S*
+master^         The parent of the commit referenced by master
-S                       Jump to the revision under the cursor in a new
+master...other  The merge base of master and other
-                        vertical split.
+master:         The tree referenced by master
-
+./master        The file named master in the working directory
-                                                *fugitive-O*
+:(top)master    The file named master in the work tree
 O                       Jump to the revision under the cursor in a new tab.
                                                *fugitive--*
 -                       Go to the tree containing the current tree or blob.
                                                *fugitive-~*
 ~                       Go to the current file in the [count]th first
                        ancestor.
                                                *fugitive-P*
 P                       Go to the current file in the [count]th parent.
                                                *fugitive-C*
 C                       Go to the commit containing the current file.
                                                *fugitive-.*
 .                       Start a |:| command line with the current revision
                        prepopulated at the end of the line.
                                                *fugitive-a*
 a                       Show the current tag, commit, or tree in an alternate
                        format.
 SPECIFYING REVISIONS                            *fugitive-revision*
 Fugitive revisions are similar to Git revisions as defined in the "SPECIFYING
 REVISIONS" section in the git-rev-parse man page.  For commands that accept an
 optional revision, the default is the file in the index for work tree files
 and the work tree file for everything else.  Example revisions follow.
 Revision        Meaning ~
 HEAD            .git/HEAD
 master          .git/refs/heads/master
 HEAD^{}         The commit referenced by HEAD
 HEAD^           The parent of the commit referenced by HEAD
 HEAD:           The tree referenced by HEAD
 /HEAD           The file named HEAD in the work tree
 Makefile        The file named Makefile in the work tree
-HEAD^:Makefile  The file named Makefile in the parent of HEAD
+@^:Makefile     The file named Makefile in the parent of HEAD
 :Makefile       The file named Makefile in the index (writable)
-               The current file in HEAD
+@~2:%           The current file in the grandparent of HEAD
-^               The current file in the previous commit
+:%              The current file in the index
-~3              The current file 3 commits ago
+:1:%            The current file's common ancestor during a conflict
-:               .git/index (Same as |:Gstatus|)
+:2:#            The alternate file in the target branch during a conflict
-:0              The current file in the index
+:3:#5           The file from buffer #5 in the merged branch during a conflict
-:1              The current file's common ancestor during a conflict
+!               The commit owning the current file
-:2              The current file in the target branch during a conflict
+!:Makefile      The file named Makefile in the commit owning the current file
-:3              The current file in the merged branch during a conflict
+!3^2            The second parent of the commit owning buffer #3
-:/foo           The most recent commit with "foo" in the message
+.git/config     The repo config file
 :               Same as |:Gstatus|
 STATUSLINE                                      *fugitive-statusline*
-                                                *fugitive#statusline()*
+                                *FugitiveStatusline()* *fugitive#statusline()*
-Add %{fugitive#statusline()} to your statusline to get an indicator including
+Add %{FugitiveStatusline()} to your statusline to get an indicator including
 the current branch and the currently edited file's commit.  If you don't have
 a statusline, this one matches the default when 'ruler' is set:
 >
-    set statusline=%<%f\ %h%m%r%{fugitive#statusline()}%=%-14.(%l,%c%V%)\ %P
+        set statusline=%<%f\ %h%m%r%{FugitiveStatusline()}%=%-14.(%l,%c%V%)\ %P
 <
-                                                *fugitive#head(...)*
+                                *FugitiveHead(...)* *fugitive#head(...)*
-Use fugitive#head() to return the name of the current branch. If the current
+Use FugitiveHead() to return the name of the current branch. If the current
-HEAD is detached, fugitive#head() will return the empty string, unless the
+HEAD is detached, FugitiveHead() will return the empty string, unless the
 optional argument is given, in which case the hash of the current commit will
 be truncated to the given number of characters.
@@ -340,6 +639,6 @@ ABOUT                                           *fugitive-about*
 Grab the latest version or report a bug on GitHub:
-http://github.com/tpope/vim-fugitive
+https://github.com/tpope/vim-fugitive
 vim:tw=78:et:ft=help:norl:
@@ -0,0 +1 @@
 autocmd BufReadPost *.fugitiveblame setfiletype fugitiveblame
@@ -0,0 +1,51 @@
 if exists("b:current_syntax")
  finish
 endif
 syn sync fromstart
 syn spell notoplevel
 syn include @fugitiveDiff syntax/diff.vim
 syn match fugitiveHeader /^[A-Z][a-z][^:]*:/ nextgroup=fugitiveHash,fugitiveSymbolicRef skipwhite
 syn region fugitiveSection start=/^\%(.*(\d\+)$\)\@=/ contains=fugitiveHeading end=/^$/
 syn cluster fugitiveSection contains=fugitiveSection
 syn match fugitiveHeading /^[A-Z][a-z][^:]*\ze (\d\+)$/ contains=fugitivePreposition contained nextgroup=fugitiveCount skipwhite
 syn match fugitiveCount /(\d\+)/hs=s+1,he=e-1 contained
 syn match fugitivePreposition /\<\%([io]nto\|from\|to\|Rebasing\%( detached\)\=\)\>/ transparent contained nextgroup=fugitiveHash,fugitiveSymbolicRef skipwhite
 syn match fugitiveInstruction /^\l\l\+\>/ contained containedin=@fugitiveSection nextgroup=fugitiveHash skipwhite
 syn match fugitiveDone /^done\>/ contained containedin=@fugitiveSection nextgroup=fugitiveHash skipwhite
 syn match fugitiveStop /^stop\>/ contained containedin=@fugitiveSection nextgroup=fugitiveHash skipwhite
 syn match fugitiveModifier /^[MADRCU?]\{1,2} / contained containedin=@fugitiveSection
 syn match fugitiveSymbolicRef /\.\@!\%(\.\.\@!\|[^[:space:][:cntrl:]\:.]\)\+\.\@<!/ contained
 syn match fugitiveHash /^\x\{4,\}\>/ contained containedin=@fugitiveSection
 syn match fugitiveHash /\<\x\{4,\}\>/ contained
 syn region fugitiveHunk start=/^\%(@@\+ -\)\@=/ end=/^\%([A-Za-z?@]\|$\)\@=/ contains=@fugitiveDiff containedin=@fugitiveSection fold
 for s:section in ['Untracked', 'Unstaged', 'Staged']
  exe 'syn region fugitive' . s:section . 'Section start=/^\%(' . s:section . ' .*(\d\+)$\)\@=/ contains=fugitive' . s:section . 'Heading end=/^$/'
  exe 'syn match fugitive' . s:section . 'Modifier /^[MADRCU?] / contained containedin=fugitive' . s:section . 'Section'
  exe 'syn cluster fugitiveSection add=fugitive' . s:section . 'Section'
  exe 'syn match fugitive' . s:section . 'Heading /^[A-Z][a-z][^:]*\ze (\d\+)$/ contains=fugitivePreposition contained nextgroup=fugitiveCount skipwhite'
 endfor
 unlet s:section
 hi def link fugitiveHeader Label
 hi def link fugitiveHeading PreProc
 hi def link fugitiveUntrackedHeading PreCondit
 hi def link fugitiveUnstagedHeading Macro
 hi def link fugitiveStagedHeading Include
 hi def link fugitiveModifier Type
 hi def link fugitiveUntrackedModifier StorageClass
 hi def link fugitiveUnstagedModifier Structure
 hi def link fugitiveStagedModifier Typedef
 hi def link fugitiveInstruction Type
 hi def link fugitiveStop Function
 hi def link fugitiveHash Identifier
 hi def link fugitiveSymbolicRef Function
 hi def link fugitiveCount Number
 let b:current_syntax = "fugitive"
@@ -0,0 +1,7 @@
 if exists("b:current_syntax")
  finish
 endif
 call fugitive#BlameSyntax()
 let b:current_syntax = "fugitiveblame"
		`@@ -0,0 +1,2 @@`
							`.git* export-ignore`
							`*.markdown export-ignore`
		`@@ -0,0 +1,2 @@`
							`github: tpope`
							`custom: ["https://www.paypal.me/vimpope"]`
		`@@ -0,0 +1 @@`
							`autocmd BufReadPost *.fugitiveblame setfiletype fugitiveblame`