Provide :Git difftool and :Git mergetool

References https://github.com/tpope/vim-fugitive/issues/132

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: tpope
+custom: ["https://www.paypal.me/vimpope"]

README.markdown

@@ -3,17 +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`.  Use
+the current Vim instance to edit commit messages and the rebase todo list.
-`:Gcommit %` to commit the current file, editing the commit message inside
+Use `:Gpush`, `:Gfetch`, and `:Gpull` to send and retrieve upstream changes.
-the currently running Vim.
 
 `:Gblame` brings up an interactive vertical split with `git blame`
 output.  Press enter on a line to edit the commit where the line
@@ -26,8 +29,9 @@ 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
@@ -37,19 +41,25 @@ 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 the web front-end of your favorite
-hosting provider, with optional line range (try it in visual mode!).  Plugins
+hosting provider, with optional line range (try it in visual mode).  Plugins
 are available for popular providers such as [GitHub][rhubarb.vim],
-[GitLab][fugitive-gitlab.vim], and [Bitbucket][fubitive.vim].
+[GitLab][fugitive-gitlab.vim], [Bitbucket][fubitive.vim],
+[Gitee][fugitive-gitee.vim], [Pagure][pagure], and
+[Phabricator][vim-phabricator].
 
 [rhubarb.vim]: https://github.com/tpope/vim-rhubarb
 [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
 
 Add `%{FugitiveStatusline()}` to `'statusline'` to get an indicator
-with the current branch in (surprise!) your statusline.
+with the current branch in your statusline.
 
-Last but not least, there's `:Git` for running any arbitrary command,
+Last but not least, there's `:Git` for running any arbitrary command.
-and `Git!` to open the output of a command in a temp file.
+
+For more information, see `:help fugitive`.
 
 ## Screencasts
 
@@ -61,40 +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 https://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
 
-> Why don't any of the commands exist?
+> Why can't I enter my password when I `:Gpush`?
 
-Fugitive cares about the current file, not the current working directory.
+It is highly recommended to use SSH keys or [credentials caching][] to avoid
-Edit a file from the repository.  To avoid the blank window problem, favor
+entering your password on every upstream interaction.  If this isn't an
-commands like `:split` and `:tabedit` over commands like `:new` and `:tabnew`.
+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.
 
-> Here's a patch that automatically opens the quickfix window after
+As an absolute last resort, you can invoke `:Git --paginate push`.  Fugitive
-> `:Ggrep`.
+recognizes the pagination request and fires up a `:terminal`, which allows for
+interactive password entry.
 
-This is a great example of why I recommend asking before patching.
+[credentials caching]: https://help.github.com/en/articles/caching-your-github-password-in-git
-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
 

doc/fugitive.txt

@@ -15,136 +15,152 @@ 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)
-                        a     Show alternative format
-                        ca    |:Gcommit| --amend
-                        cc    |:Gcommit|
-                        ce    |:Gcommit| --amend --no-edit
-                        cw    |:Gcommit| --amend --only
-                        cva   |:Gcommit| --verbose --amend
-                        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|
-                        U     |:Git| checkout
-                        U     |:Git| checkout HEAD (staged files)
-                        U     |:Git| clean (untracked files)
-                        U     |:Git| rm (unmerged files)
-                        .     enter |:| command line with file prepopulated
-
-                                                *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.
 
-                                                *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-:Grebase*
+                                                *:Git-rebase* *:Grebase*
-:Grebase [args]         Like |:Gmerge|, but for git-rebase.  Interactive
+:Git rebase [args]      Like |:Gmerge|, but for git-rebase.  Interactive
-                        rebase not supported.
+:Grebase [args]         rebase is experimentally supported.
 
-                                                *fugitive-:Gpush*
+                                                *:Git-push* *:Gpush*
-:Gpush [args]           Invoke git-push, load the results into the |quickfix|
+:Git push [args]        Invoke git-push, load the results into the |quickfix|
-                        list, and invoke |:cwindow| to reveal any errors.
+: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*
+: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:
+
+                        g?    show this help
+                        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])
+
+:[range]Gblame [flags]  If a range is given, just that part of the file will
+:Gblame [flags] {file}  be blamed, and a horizontal split without
+:Git blame ...          scrollbinding is used.  You can also give an arbitrary
+                        filename.
+
+                                                *:Ggrep* *:Gcgrep* *:Git-grep*
 :Ggrep[!] [args]        |:grep|[!] with git-grep as 'grepprg'.
+:Git[!] grep [args]
 
-                                                *fugitive-:Glgrep*
+                                                *:Glgrep*
 :Glgrep[!] [args]       |:lgrep|[!] with git-grep as 'grepprg'.
+:0Git[!] grep [args]
 
-                                                *fugitive-:Glog*
+                                                *:Git-difftool*
-:Glog [args]            Load all previous revisions of the current file into
+:Git[!] difftool [args] Invoke `git diff [args]` and load the changes into the
-                        the |quickfix| list.  Additional git-log arguments can
+                        quickfix list.  Each changed hunk gets a separate
-                        be given (for example, --reverse).  If "--" appears as
+                        quickfix entry unless you pass an option like
-                        an argument, no file specific filtering is done, and
+                        --name-only or --name-status.  Jumps to the first
-                        previous commits rather than previous file revisions
+                        change unless [!] is given.
-                        are loaded.
 
-:{range}Glog [args]     Use git-log -L to load previous revisions of the given
+:Git difftool -y [args] Invoke `git diff [args]`, open each changed file in a
+                        new tab, and invoke `:Gdiffsplit` against the
+                        appropriate commit.
+
+                                                *:Git-mergetool*
+:Git mergetool [args]   Like |:Git-difftool|, but target merge conflicts.
+
+                                                 *:Gclog* *:Glog*
+: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.
+
+:{range}Gclog[!] [args] Use git-log -L to load previous revisions of the given
                         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.
+                        first diff hunk for each commit.  Use :0Gclog to
+                        target the entire file.
 
-                                                *fugitive-:Gllog*
+                                                *:Gllog*
-:Gllog [args]           Like |:Glog|, but use the location list instead of the
+:Gllog [args]           Like |:Gclog|, but use the location list instead of the
                         |quickfix| list.
 
-                                        *fugitive-:Gedit* *fugitive-:Ge*
+                                                *:Gcd*
+:Gcd [directory]        |:cd| relative to the repository.
+
+                                                *:Glcd*
+:Glcd [directory]       |:lcd| relative to the repository.
+
+                                                *:Gedit* *fugitive-:Ge*
 :Gedit [object]         |:edit| a |fugitive-object|.
 
-                                                *fugitive-:Gsplit*
+                                                *:Gsplit*
 :Gsplit [object]        |:split| a |fugitive-object|.
 
-                                                *fugitive-:Gvsplit*
+                                                *:Gvsplit*
 :Gvsplit [object]       |:vsplit| a |fugitive-object|.
 
-                                                *fugitive-:Gtabedit*
+                                                *:Gtabedit*
 :Gtabedit [object]      |:tabedit| a |fugitive-object|.
 
-                                                *fugitive-:Gpedit*
+                                                *:Gpedit*
 :Gpedit [object]        |:pedit| a |fugitive-object|.
 
-:Gsplit! [args]                 *fugitive-:Gsplit!* *fugitive-:Gvsplit!*
+:Gsplit! [args]                                 *:Gsplit!* *:Gvsplit!*
-:Gvsplit! [args]                *fugitive-:Gtabedit!* *fugitive-:Gpedit!*
+:Gvsplit! [args]                                *:Gtabedit!* *:Gpedit!*
-:Gtabedit! [args]       Like |:Git!|, but open the resulting temp file in a
+:Gtabedit! [args]       Capture the output of `git [args]` to a temp file and
-:Gpedit! [args]         split, tab, or preview window.
+:Gpedit! [args]         open it in a split, tab, or preview window.  Use
+                        :0Gsplit! to suppress the split and open it in the
+                        current window.
 
-                                                *fugitive-:Gread*
+                                                *: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
@@ -152,13 +168,13 @@ that are part of Git repositories).
 
 :{range}Gread [object]  |:read| in a |fugitive-object| 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}.
 
-                                        *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
@@ -168,75 +184,60 @@ 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 [object]         Perform a |vimdiff| against the given file, or if a
+:Gdiffsplit [object]    Perform a |vimdiff| against the given file, or if a
                         commit is given, the current file in that commit.
-                        With no argument, the version in the index is used
+                        With no argument, the version in the index or work
-                        (which means a three-way diff during a merge conflict,
+                        tree is used.  The newer of the two files is placed to
-                        making it a git-mergetool alternative).  The newer of
+                        the right or bottom, depending on 'diffopt' and the
-                        the two files is placed to the right or bottom,
+                        width of the window relative to 'textwidth'.  Use
-                        depending on 'diffopt', and the width of the window
+                        Vim's |do| and |dp| to stage and unstage changes.
-                        relative to 'textwidth'.  Use |do| and |dp| and write
-                        to the index file to simulate "git add --patch". For
-                        the three-way diff, there is also d2o and d3o pulling
-                        the hunk to the middle from the left or the right
-                        window, respectively.
 
-                                                *fugitive-:Gsdiff*
+                                                *:Gdiffsplit!*
-:Gsdiff [object]        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 [object]        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.  Add a ! to pass -f.
 
-                                                *fugitive-:Grename*
+                                                *:Grename*
 :Grename {destination}  Like |:Gmove| but operates relative to the parent
                         directory of the current file.
 
-                                                *fugitive-:Gdelete*
+                                                *: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-:Gremove*
+                                                *:Gremove*
 :Gremove                Like :Gdelete, but keep the (now empty) buffer around.
 
-                                                *fugitive-:Gblame*
+                                                *:Gbrowse*
-:Gblame [flags]         Run git-blame on the file and open the results in a
-                        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
-                        A     resize to end of author column
-                        C     resize to end of commit column
-                        D     resize to end of date/time column
-                        q     close blame and return to blamed window
-                        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
-                        p     open commit in preview window
-                        -     reblame at commit
-                        ~     reblame at [count]th first grandparent
-                        P     reblame at [count]th parent (like HEAD^[count])
-
-                                                *fugitive-:Gbrowse*
 :Gbrowse                Open the current file, blob, tree, commit, or tag
                         in your browser at the upstream hosting provider.
                         If a range is given, it is appropriately appended to
@@ -262,53 +263,333 @@ that are part of Git repositories).
 :[range]Gbrowse! [args] Like :Gbrowse, but put the URL on the clipboard rather
                         than opening it.
 
-MAPPINGS                                        *fugitive-mappings*
+MAPS                                            *fugitive-maps*
 
-These maps are available everywhere.
+These maps are available in both the |:Gstatus| buffer and Fugitive object
+buffers, although not all maps make sense in all buffers.  Mappings that
+operate on the file or hunk under the cursor are generally available in visual
+mode to operate on multiple files or partial hunks.
 
-                                                *fugitive-c_CTRL-R_CTRL-G*
+                                                *fugitive-staging-maps*
+Staging/unstaging maps ~
+
+                                                *fugitive_s*
+s                       Stage (add) the file or hunk under the cursor.
+
+                                                *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
                         |fugitive-object| (that is, a representation of the
                         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
+["x]y<C-G>              Yank the path to the current |fugitive-object|.
-                        |fugitive-object|.
-
-These maps are available in committed Git objects.
-
-                                                *fugitive-<CR>*
-<CR>                    Jump to the |fugitive-object| under the cursor.
-
-                                                *fugitive-o*
-o                       Jump to the |fugitive-object| under the cursor in a
-                        new split.
-
-                                                *fugitive-S*
-S                       Jump to the |fugitive-object| under the cursor in a
-                        new vertical split.
-
-                                                *fugitive-O*
-O                       Jump to the |fugitive-object| 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-a*
-a                       Show the current tag, commit, or tree in an alternate
-                        format.
 
+                                                *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 objects are either work tree files or Git revisions as defined in the
@@ -318,12 +599,13 @@ 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.
 
 Object          Meaning ~
-HEAD            .git/HEAD
-refs/heads/x    .git/refs/heads/x (in "common dir" if present)
 @               The commit referenced by @ aka HEAD
+master          The commit referenced by master
 master^         The parent of the commit referenced by master
+master...other  The merge base of master and other
 master:         The tree referenced by master
 ./master        The file named master in the working directory
+:(top)master    The file named master in the work tree
 Makefile        The file named Makefile in the work tree
 @^:Makefile     The file named Makefile in the parent of HEAD
 :Makefile       The file named Makefile in the index (writable)
@@ -357,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:

plugin/fugitive.vim

@@ -1,6 +1,6 @@
 " fugitive.vim - A Git wrapper so awesome, it should be illegal
 " Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      2.5
+" Version:      3.1
 " GetLatestVimScripts: 2975 1 :AutoInstall: fugitive.vim
 
 if exists('g:loaded_fugitive')
@@ -9,8 +9,15 @@ endif
 let g:loaded_fugitive = 1
 
 function! FugitiveGitDir(...) abort
-  if !a:0 || a:1 ==# -1
+  if !a:0 || type(a:1) == type(0) && a:1 < 0
-    return get(b:, 'git_dir', '')
+    if exists('g:fugitive_event')
+      return g:fugitive_event
+    endif
+    let dir = get(b:, 'git_dir', '')
+    if empty(dir) && (empty(bufname('')) || &buftype =~# '^\%(nofile\|acwrite\|quickfix\|prompt\)$')
+      return FugitiveExtractGitDir(getcwd())
+    endif
+    return dir
   elseif type(a:1) == type(0)
     return getbufvar(a:1, 'git_dir')
   elseif type(a:1) == type('')
@@ -20,18 +27,14 @@ function! FugitiveGitDir(...) abort
   endif
 endfunction
 
-function! FugitiveCommonDir(...) abort
+" FugitiveReal() takes a fugitive:// URL and returns the corresponding path in
-  let dir = FugitiveGitDir(a:0 ? a:1 : -1)
+" the work tree.  This may be useful to get a cleaner path for inclusion in
-  if empty(dir)
+" the statusline, for example.  Note that the file and its parent directories
-    return ''
+" are not guaranteed to exist.
-  endif
+"
-  return fugitive#CommonDir(dir)
+" This is intended as an abstract API to be used on any "virtual" path.  For a
-endfunction
+" buffer named foo://bar, check for a function named FooReal(), and if it
-
+" exists, call FooReal("foo://bar").
-function! FugitiveWorkTree(...) abort
-  return FugitiveTreeForGitDir(FugitiveGitDir(a:0 ? a:1 : -1))
-endfunction
-
 function! FugitiveReal(...) abort
   let file = a:0 ? a:1 : @%
   if file =~# '^\a\a\+:' || a:0 > 1
@@ -43,6 +46,13 @@ function! FugitiveReal(...) abort
   endif
 endfunction
 
+" FugitiveFind() takes a Fugitive object and returns the appropriate Vim
+" buffer name.  You can use this to generate Fugitive URLs ("HEAD:README") or
+" to get the absolute path to a file in the Git dir (".git/HEAD"), the common
+" dir (".git/config"), or the work tree (":(top)Makefile").
+"
+" An optional second argument provides the Git dir, or the buffer number of a
+" buffer with a Git dir.  The default is the current buffer.
 function! FugitiveFind(...) abort
   return fugitive#Find(a:0 ? a:1 : bufnr(''), FugitiveGitDir(a:0 > 1 ? a:2 : -1))
 endfunction
@@ -55,12 +65,15 @@ function! FugitivePath(...) abort
   endif
 endfunction
 
+" FugitiveParse() takes a fugitive:// URL and returns a 2 element list
+" containing the Git dir and an object name ("commit:file").  It's effectively
+" then inverse of FugitiveFind().
 function! FugitiveParse(...) abort
   let path = s:Slash(a:0 ? a:1 : @%)
   if path !~# '^fugitive:'
     return ['', '']
   endif
-  let vals = matchlist(path, '\c^fugitive:\%(//\)\=\(.\{-\}\)\%(//\|::\)\(\x\{40\}\|[0-3]\)\(/.*\)\=$')
+  let vals = matchlist(path, '\c^fugitive:\%(//\)\=\(.\{-\}\)\%(//\|::\)\(\x\{40,\}\|[0-3]\)\(/.*\)\=$')
   if len(vals)
     return [(vals[2] =~# '^.$' ? ':' : '') . vals[2] . substitute(vals[3], '^/', ':', ''), vals[1]]
   endif
@@ -68,12 +81,26 @@ function! FugitiveParse(...) abort
   throw v:errmsg
 endfunction
 
+" FugitivePrepare() constructs a Git command string which can be executed with
+" functions like system() and commands like :!.  Integer arguments will be
+" treated as buffer numbers, and the appropriate relative path inserted in
+" their place.
+"
+" If the first argument is a string that looks like a path or an empty string,
+" it will be used as the Git dir.  If it's a buffer number, the Git dir for
+" that buffer will be used.  The default is the current buffer.
 function! FugitivePrepare(...) abort
   return call('fugitive#Prepare', a:000)
 endfunction
 
-function! FugitiveConfig(key, ...) abort
+function! FugitiveConfig(...) abort
-  return fugitive#Config(a:key, FugitiveGitDir(a:0 ? a:1 : -1))
+  if a:0 == 2 && type(a:2) != type({})
+    return fugitive#Config(a:1, FugitiveGitDir(a:2))
+  elseif a:0 == 1 && a:1 !~# '^[[:alnum:]-]\+\.'
+    return fugitive#Config(FugitiveGitDir(a:1))
+  else
+    return call('fugitive#Config', a:000)
+  endif
 endfunction
 
 function! FugitiveRemoteUrl(...) abort
@@ -95,16 +122,28 @@ function! FugitiveStatusline(...) abort
   return fugitive#Statusline()
 endfunction
 
+function! FugitiveCommonDir(...) abort
+  let dir = FugitiveGitDir(a:0 ? a:1 : -1)
+  if empty(dir)
+    return ''
+  endif
+  return fugitive#CommonDir(dir)
+endfunction
+
+function! FugitiveWorkTree(...) abort
+  return s:Tree(FugitiveGitDir(a:0 ? a:1 : -1))
+endfunction
+
 function! FugitiveIsGitDir(path) abort
   let path = substitute(a:path, '[\/]$', '', '') . '/'
-  return getfsize(path.'HEAD') > 10 && (
+  return len(a:path) && getfsize(path.'HEAD') > 10 && (
         \ isdirectory(path.'objects') && isdirectory(path.'refs') ||
         \ getftype(path.'commondir') ==# 'file')
 endfunction
 
 let s:worktree_for_dir = {}
 let s:dir_for_worktree = {}
-function! FugitiveTreeForGitDir(path) abort
+function! s:Tree(path) abort
   let dir = a:path
   if dir =~# '/\.git$'
     return len(dir) ==# 5 ? '/' : dir[0:-6]
@@ -118,16 +157,16 @@ function! FugitiveTreeForGitDir(path) abort
       let config = readfile(config_file,'',10)
       call filter(config,'v:val =~# "^\\s*worktree *="')
       if len(config) == 1
-        let worktree = matchstr(config[0], '= *\zs.*')
+        let worktree = FugitiveVimPath(matchstr(config[0], '= *\zs.*'))
       endif
     elseif filereadable(dir . '/gitdir')
-      let worktree = fnamemodify(readfile(dir . '/gitdir')[0], ':h')
+      let worktree = fnamemodify(FugitiveVimPath(readfile(dir . '/gitdir')[0]), ':h')
       if worktree ==# '.'
         unlet! worktree
       endif
     endif
     if exists('worktree')
-      let s:worktree_for_dir[dir] = worktree
+      let s:worktree_for_dir[dir] = s:Slash(resolve(worktree))
       let s:dir_for_worktree[s:worktree_for_dir[dir]] = dir
     endif
   endif
@@ -138,10 +177,29 @@ function! FugitiveTreeForGitDir(path) abort
   endif
 endfunction
 
+function! s:CeilingDirectories() abort
+  if !exists('s:ceiling_directories')
+    let s:ceiling_directories = []
+    let resolve = 1
+    for dir in split($GIT_CEILING_DIRECTORIES, has('win32') ? ';' : ':', 1)
+      if empty(dir)
+        let resolve = 0
+      elseif resolve
+        call add(s:ceiling_directories, resolve(dir))
+      else
+        call add(s:ceiling_directories, dir)
+      endif
+    endfor
+  endif
+  return s:ceiling_directories + get(g:, 'ceiling_directories', [])
+endfunction
+
 function! FugitiveExtractGitDir(path) abort
   let path = s:Slash(a:path)
   if path =~# '^fugitive:'
     return matchstr(path, '\C^fugitive:\%(//\)\=\zs.\{-\}\ze\%(//\|::\|$\)')
+  elseif empty(path)
+    return ''
   elseif isdirectory(path)
     let path = fnamemodify(path, ':p:s?/$??')
   else
@@ -153,25 +211,23 @@ function! FugitiveExtractGitDir(path) abort
   endif
   let root = resolve(path)
   if root !=# path
-    silent! exe haslocaldir() ? 'lcd .' : 'cd .'
+    silent! exe (haslocaldir() ? 'lcd' : exists(':tcd') && haslocaldir(-1) ? 'tcd' : 'cd') '.'
   endif
   let previous = ""
+  let env_git_dir = len($GIT_DIR) ? s:Slash(simplify(fnamemodify(FugitiveVimPath($GIT_DIR), ':p:s?[\/]$??'))) : ''
+  call s:Tree(env_git_dir)
   while root !=# previous
     if root =~# '\v^//%([^/]+/?)?$'
       break
     endif
-    if index(split($GIT_CEILING_DIRECTORIES, ':'), root) >= 0
+    if index(s:CeilingDirectories(), root) >= 0
       break
     endif
-    if root ==# $GIT_WORK_TREE && FugitiveIsGitDir($GIT_DIR)
+    if root ==# $GIT_WORK_TREE && FugitiveIsGitDir(env_git_dir)
-      return simplify(fnamemodify($GIT_DIR, ':p:s?[\/]$??'))
+      return env_git_dir
-    endif
+    elseif has_key(s:dir_for_worktree, root)
-    if FugitiveIsGitDir($GIT_DIR)
-      call FugitiveWorkTree(simplify(fnamemodify($GIT_DIR, ':p:s?[\/]$??')))
-      if has_key(s:dir_for_worktree, root)
       return s:dir_for_worktree[root]
     endif
-    endif
     let dir = substitute(root, '[\/]$', '', '') . '/.git'
     let type = getftype(dir)
     if type ==# 'dir' && FugitiveIsGitDir(dir)
@@ -180,10 +236,11 @@ function! FugitiveExtractGitDir(path) abort
       return resolve(dir)
     elseif type !=# '' && filereadable(dir)
       let line = get(readfile(dir, '', 1), 0, '')
-      if line =~# '^gitdir: \.' && FugitiveIsGitDir(root.'/'.line[8:-1])
+      let file_dir = s:Slash(FugitiveVimPath(matchstr(line, '^gitdir: \zs.*')))
-        return simplify(root.'/'.line[8:-1])
+      if file_dir !~# '^/\|^\a:' && FugitiveIsGitDir(root . '/' . file_dir)
-      elseif line =~# '^gitdir: ' && FugitiveIsGitDir(line[8:-1])
+        return simplify(root . '/' . file_dir)
-        return line[8:-1]
+      elseif len(file_dir) && FugitiveIsGitDir(file_dir)
+        return file_dir
       endif
     elseif FugitiveIsGitDir(root)
       return root
@@ -209,6 +266,18 @@ function! FugitiveDetect(path) abort
   endif
 endfunction
 
+function! FugitiveVimPath(path) abort
+  if exists('+shellslash') && !&shellslash
+    return tr(a:path, '/', '\')
+  else
+    return a:path
+  endif
+endfunction
+
+function! FugitiveGitPath(path) abort
+  return s:Slash(a:path)
+endfunction
+
 function! s:Slash(path) abort
   if exists('+shellslash')
     return tr(a:path, '\', '/')
@@ -222,41 +291,62 @@ function! s:ProjectionistDetect() abort
   let dir = FugitiveExtractGitDir(file)
   let base = matchstr(file, '^fugitive://.\{-\}//\x\+')
   if empty(base)
-    let base = FugitiveTreeForGitDir(dir)
+    let base = s:Tree(dir)
   endif
   if len(base)
     if exists('+shellslash') && !&shellslash
       let base = tr(base, '/', '\')
     endif
-    call projectionist#append(base, FugitiveCommonDir(dir) . '/info/projections.json')
+    let file = FugitiveCommonDir(dir) . '/info/projections.json'
+    if filereadable(file)
+      call projectionist#append(base, file)
+    endif
   endif
 endfunction
 
+if v:version + has('patch061') < 703
+  runtime! autoload/fugitive.vim
+endif
+let g:io_fugitive = {
+      \ 'simplify': function('fugitive#simplify'),
+      \ 'resolve': function('fugitive#resolve'),
+      \ 'getftime': function('fugitive#getftime'),
+      \ 'getfsize': function('fugitive#getfsize'),
+      \ 'getftype': function('fugitive#getftype'),
+      \ 'filereadable': function('fugitive#filereadable'),
+      \ 'filewritable': function('fugitive#filewritable'),
+      \ 'isdirectory': function('fugitive#isdirectory'),
+      \ 'getfperm': function('fugitive#getfperm'),
+      \ 'setfperm': function('fugitive#setfperm'),
+      \ 'readfile': function('fugitive#readfile'),
+      \ 'writefile': function('fugitive#writefile'),
+      \ 'glob': function('fugitive#glob'),
+      \ 'delete': function('fugitive#delete'),
+      \ 'Real': function('FugitiveReal')}
+
 augroup fugitive
   autocmd!
 
   autocmd BufNewFile,BufReadPost * call FugitiveDetect(expand('<amatch>:p'))
   autocmd FileType           netrw call FugitiveDetect(fnamemodify(get(b:, 'netrw_curdir', expand('<amatch>')), ':p'))
-  autocmd User NERDTreeInit,NERDTreeNewRoot
-        \ if exists('b:NERDTree.root.path.str') |
-        \   call FugitiveDetect(b:NERDTree.root.path.str()) |
-        \ endif
-  autocmd VimEnter * if empty(expand('<amatch>'))|call FugitiveDetect(getcwd())|endif
-  autocmd CmdWinEnter * call FugitiveDetect(expand('#:p'))
 
   autocmd FileType git
-        \ if exists('b:git_dir') |
+        \ if len(FugitiveGitDir()) |
         \   call fugitive#MapJumps() |
         \   call fugitive#MapCfile() |
         \ endif
   autocmd FileType gitcommit
-        \ if exists('b:git_dir') |
+        \ if len(FugitiveGitDir()) |
+        \   call fugitive#MapCfile('fugitive#MessageCfile()') |
+        \ endif
+  autocmd FileType fugitive
+        \ if len(FugitiveGitDir()) |
         \   call fugitive#MapCfile('fugitive#StatusCfile()') |
         \ endif
   autocmd FileType gitrebase
         \ let &l:include = '^\%(pick\|squash\|edit\|reword\|fixup\|drop\|[pserfd]\)\>' |
-        \ if exists('b:git_dir') |
+        \ if len(FugitiveGitDir()) |
-        \   let &l:includeexpr = 'v:fname =~# ''^\x\{4,40\}$'' ? FugitiveFind(v:fname) : ' .
+        \   let &l:includeexpr = 'v:fname =~# ''^\x\{4,\}$'' ? FugitiveFind(v:fname) : ' .
         \   (len(&l:includeexpr) ? &l:includeexpr : 'v:fname') |
         \ endif |
         \ let b:undo_ftplugin = get(b:, 'undo_ftplugin', 'exe') . '|setl inex= inc='
@@ -266,10 +356,18 @@ augroup fugitive
         \   let b:git_dir = s:Slash(expand('<amatch>:p:h')) |
         \   exe fugitive#BufReadStatus() |
         \ elseif filereadable(expand('<amatch>')) |
-        \   read <amatch> |
+        \   silent doautocmd BufReadPre |
+        \   keepalt read <amatch> |
         \   1delete_ |
+        \   silent doautocmd BufReadPost |
+        \ else |
+        \   silent doautocmd BufNewFile |
+        \ endif
+
+  autocmd BufReadCmd    fugitive://*//*             exe fugitive#BufReadCmd() |
+        \ if &path =~# '^\.\%(,\|$\)' |
+        \   let &l:path = substitute(&path, '^\.,\=', '', '') |
         \ endif
-  autocmd BufReadCmd    fugitive://*//*             exe fugitive#BufReadCmd()
   autocmd BufWriteCmd   fugitive://*//[0-3]/*       exe fugitive#BufWriteCmd()
   autocmd FileReadCmd   fugitive://*//*             exe fugitive#FileReadCmd()
   autocmd FileWriteCmd  fugitive://*//[0-3]/*       exe fugitive#FileWriteCmd()
@@ -281,3 +379,94 @@ augroup fugitive
 
   autocmd User ProjectionistDetect call s:ProjectionistDetect()
 augroup END
+
+let s:addr_other = has('patch-8.1.560') ? '-addr=other' : ''
+let s:addr_tabs  = has('patch-7.4.542') ? '-addr=tabs' : ''
+let s:addr_wins  = has('patch-7.4.542') ? '-addr=windows' : ''
+
+exe 'command! -bang -nargs=? -range=-1' s:addr_other '-complete=customlist,fugitive#Complete G   exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+exe 'command! -bang -nargs=? -range=-1' s:addr_other '-complete=customlist,fugitive#Complete Git exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+
+exe 'command! -bang -bar     -range=-1' s:addr_other 'Gstatus exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+
+exe 'command! -bang -nargs=? -range=-1' s:addr_other '-complete=customlist,fugitive#CommitComplete Gcommit exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "commit " . <q-args>)'
+exe 'command! -bang -nargs=? -range=-1' s:addr_other '-complete=customlist,fugitive#RevertComplete Grevert exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "revert " . <q-args>)'
+exe 'command! -bang -nargs=? -range=-1' s:addr_other '-complete=customlist,fugitive#MergeComplete  Gmerge  exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "merge " . <q-args>)'
+exe 'command! -bang -nargs=? -range=-1' s:addr_other '-complete=customlist,fugitive#RebaseComplete Grebase exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "rebase " . <q-args>)'
+exe 'command! -bang -nargs=? -range=-1' s:addr_other '-complete=customlist,fugitive#PullComplete   Gpull   exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "pull " . <q-args>)'
+exe 'command! -bang -nargs=? -range=-1' s:addr_other '-complete=customlist,fugitive#PushComplete   Gpush   exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "push " . <q-args>)'
+exe 'command! -bang -nargs=? -range=-1' s:addr_other '-complete=customlist,fugitive#FetchComplete  Gfetch  exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "fetch " . <q-args>)'
+exe 'command! -bang -nargs=? -range=-1                -complete=customlist,fugitive#BlameComplete  Gblame  exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "blame " . <q-args>)'
+
+exe "command! -bar -bang -nargs=? -complete=customlist,fugitive#CdComplete Gcd  exe fugitive#Cd(<q-args>, 0)"
+exe "command! -bar -bang -nargs=? -complete=customlist,fugitive#CdComplete Glcd exe fugitive#Cd(<q-args>, 1)"
+
+exe 'command! -bang -nargs=? -range=-1' s:addr_wins '-complete=customlist,fugitive#GrepComplete Ggrep  exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "grep " . <q-args>)'
+exe 'command! -bang -nargs=? -range=-1' s:addr_wins '-complete=customlist,fugitive#GrepComplete Gcgrep exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "grep " . <q-args>)'
+exe 'command! -bang -nargs=? -range=-1' s:addr_wins '-complete=customlist,fugitive#GrepComplete Glgrep exe fugitive#Command(0, <count> > 0 ? <count> : 0, +"<range>", <bang>0, "<mods>", "grep " . <q-args>)'
+
+exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Glog  :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "")'
+exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Gclog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "c")'
+exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Gllog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "l")'
+
+exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#EditComplete   Ge       exe fugitive#Open("edit<bang>", 0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#EditComplete   Gedit    exe fugitive#Open("edit<bang>", 0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#ReadComplete   Gpedit   exe fugitive#Open("pedit", <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=* -range=-1' s:addr_other '-complete=customlist,fugitive#ReadComplete   Gsplit   exe fugitive#Open((<count> > 0 ? <count> : "").(<count> ? "split" : "edit"), <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=* -range=-1' s:addr_other '-complete=customlist,fugitive#ReadComplete   Gvsplit  exe fugitive#Open((<count> > 0 ? <count> : "").(<count> ? "vsplit" : "edit!"), <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=* -range=-1' s:addr_tabs  '-complete=customlist,fugitive#ReadComplete   Gtabedit exe fugitive#Open((<count> >= 0 ? <count> : "")."tabedit", <bang>0, "<mods>", <q-args>, [<f-args>])'
+
+if exists(':Gr') != 2
+  exe 'command! -bar -bang -nargs=* -range=-1                -complete=customlist,fugitive#ReadComplete   Gr     exe fugitive#ReadCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+endif
+exe 'command! -bar -bang -nargs=* -range=-1                -complete=customlist,fugitive#ReadComplete   Gread    exe fugitive#ReadCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gdiffsplit  exe fugitive#Diffsplit(1, <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Ghdiffsplit exe fugitive#Diffsplit(0, <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gvdiffsplit exe fugitive#Diffsplit(0, <bang>0, "vert <mods>", <q-args>, [<f-args>])'
+
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gw     exe fugitive#WriteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gwrite exe fugitive#WriteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gwq    exe fugitive#WqCommand(   <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+
+exe 'command! -bar -bang -nargs=0 -complete=customlist,fugitive#CompleteObject Gremove exe fugitive#RemoveCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=0 -complete=customlist,fugitive#CompleteObject Gdelete exe fugitive#DeleteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#CompleteObject Gmove   exe fugitive#MoveCommand(  <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#RenameComplete Grename exe fugitive#RenameCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+
+exe 'command! -bar -bang -range=-1 -nargs=* -complete=customlist,fugitive#CompleteObject Gbrowse exe fugitive#BrowseCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+
+if get(g:, 'fugitive_no_maps')
+  finish
+endif
+
+let s:nowait = v:version >= 704 ? '<nowait>' : ''
+
+function! s:Map(mode, lhs, rhs, ...) abort
+  for mode in split(a:mode, '\zs')
+    let flags = (a:0 ? a:1 : '') . (a:rhs =~# '<Plug>' ? '' : '<script>')
+    let head = a:lhs
+    let tail = ''
+    let keys = get(g:, mode.'remap', {})
+    if type(keys) == type([])
+      return
+    endif
+    while !empty(head)
+      if has_key(keys, head)
+        let head = keys[head]
+        if empty(head)
+          return
+        endif
+        break
+      endif
+      let tail = matchstr(head, '<[^<>]*>$\|.$') . tail
+      let head = substitute(head, '<[^<>]*>$\|.$', '', '')
+    endwhile
+    if flags !~# '<unique>' || empty(mapcheck(head.tail, mode))
+      exe mode.'map' s:nowait flags head.tail a:rhs
+    endif
+  endfor
+endfunction
+
+call s:Map('c', '<C-R><C-G>', 'fnameescape(fugitive#Object(@%))', '<expr>')
+call s:Map('n', 'y<C-G>', ':<C-U>call setreg(v:register, fugitive#Object(@%))<CR>', '<silent>')

syntax/fugitive.vim

@@ -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"

syntax/fugitiveblame.vim

@@ -0,0 +1,7 @@
+if exists("b:current_syntax")
+  finish
+endif
+
+call fugitive#BlameSyntax()
+
+let b:current_syntax = "fugitiveblame"