Timestamp WIP

CONTRIBUTING.markdown

@@ -1,18 +0,0 @@
-Before reporting a bug, you should try stripping down your Vim configuration
-and removing other plugins.  The sad truth about VimScript is that it is
-fraught with incompatibilities waiting to happen.  I'm happy to work around
-them where I can, but it's up to you to isolate the conflict.
-
-Fugitive is particularly prone to regressions due to Git version issues,
-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),
-I'm not going to accept it.  Period.
-
-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
-perverse knowledge of VimScript so vast that many would consider it a symptom
-of mental illness.  On the flip side, some ideas I'll reject no matter how
-good the implementation is.  "Send a patch" is an edge case answer in my book.

README.markdown

@@ -1,4 +1,5 @@
-# fugitive.vim
+fugitive.vim
+============
 
 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:
@@ -11,13 +12,13 @@ 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
-`add`/`reset` a file's changes, or `p` to `add`/`reset` `--patch`.  And guess
-what `:Gcommit` does!
+`add`/`reset` a file's changes, or `p` to `add`/`reset` `--patch` that
+mofo.  And guess what `:Gcommit` does!
 
 `:Gblame` brings up an interactive vertical split with `git blame`
-output.  Press enter on a line to edit the commit where the line
-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.
+output.  Press enter on a line to reblame the file as it stood in that
+commit, or `o` to open that commit 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
@@ -45,7 +46,8 @@ with the current branch in (surprise!) your statusline.
 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.
 
-## Screencasts
+Screencasts
+-----------
 
 * [A complement to command line git](http://vimcasts.org/e/31)
 * [Working with the git index](http://vimcasts.org/e/32)
@@ -53,7 +55,8 @@ and `Git!` to open the output of a command in a temp file.
 * [Browsing the git object database](http://vimcasts.org/e/34)
 * [Exploring the history of a git repository](http://vimcasts.org/e/35)
 
-## Installation
+Installation
+------------
 
 If you don't have a preferred installation method, I recommend
 installing [pathogen.vim](https://github.com/tpope/vim-pathogen), and
@@ -69,7 +72,8 @@ 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
+FAQ
+---
 
 > I installed the plugin and started Vim.  Why don't any of the commands
 > exist?
@@ -82,13 +86,12 @@ directory.  Edit a file from the repository.
 Fugitive cares about the current file, not the current working
 directory.  Edit a file from the repository.
 
-> Why is `:Gbrowse` not using the right browser?
+> Why is `:Gbrowse` not using my system default 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.
+when it comes to finding the default browser on Linux.  You can tell it
+the correct browser to use with `git config --global web.browser ...`.
+See `git web--browse --help` for details.
 
 > Here's a patch that automatically opens the quickfix window after
 > `:Ggrep`.
@@ -105,7 +108,32 @@ to open after any grep invocation:
 
     autocmd QuickFixCmdPost *grep* cwindow
 
-## Self-Promotion
+Contributing
+------------
+
+Before reporting a bug, you should try stripping down your Vim
+configuration and removing other plugins.  The sad nature of VimScript
+is that it is fraught with incompatibilities waiting to happen.  I'm
+happy to work around them where I can, but it's up to you to isolate
+the conflict.
+
+If your [commit message sucks](http://stopwritingramblingcommitmessages.com/),
+I'm not going to accept your pull request.  I've explained very politely
+dozens of times that
+[my general guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
+are absolute rules on my own repositories, so I may lack the energy to
+explain it to you yet another time.  And please, if I ask you to change
+something, `git commit --amend`.
+
+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 perverse knowledge of VimScript so vast that many would consider
+it a symptom of mental illness.  On the flip side, some ideas I'll
+reject no matter how good the implementation is.  "Send a patch" is an
+edge case answer in my book.
+
+Self-Promotion
+--------------
 
 Like fugitive.vim? Follow the repository on
 [GitHub](https://github.com/tpope/vim-fugitive) and vote for it on
@@ -114,7 +142,8 @@ you're feeling especially charitable, follow [tpope](http://tpo.pe/) on
 [Twitter](http://twitter.com/tpope) and
 [GitHub](https://github.com/tpope).
 
-## License
+License
+-------
 
 Copyright (c) Tim Pope.  Distributed under the same terms as Vim itself.
 See `:help license`.

doc/fugitive.txt

@@ -34,17 +34,14 @@ that are part of Git repositories).
                         window.  The following maps, which work on the cursor
                         line file where sensible, are provided:
 
-                        g?    show this help
                         <C-N> next file
                         <C-P> previous file
                         <CR>  |:Gedit|
                         -     |:Git| add
                         -     |:Git| reset (staged files)
+                        C     |:Gcommit|
                         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)
@@ -55,7 +52,7 @@ that are part of Git repositories).
                         p     |:Git| add --patch
                         p     |:Git| reset --patch (staged files)
                         q     close status
-                        r     reload status
+                        R     reload status
                         S     |:Gvsplit|
 
                                                 *fugitive-:Gcommit*
@@ -123,7 +120,7 @@ that are part of Git repositories).
 
 :{range}Gread! [args]  |:read| the output of a Git command after {range}.
 
-                                        *fugitive-:Gw* *fugitive-:Gwrite*
+                                                *fugitive-:Gwrite*
 :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
@@ -149,16 +146,14 @@ that are part of Git repositories).
                         index is used (which means a three-way diff during a
                         merge conflict, making it a git-mergetool
                         alternative).  The newer of the two files is placed
-                        to the right or bottom, depending on 'diffopt' and
-                        the width of the window relative to 'textwidth'.  Use
-                        |do| and |dp| and write to the index file to simulate
-                        "git add --patch".
+                        to the right.  Use |do| and |dp| and write to the
+                        index file to simulate "git add --patch".
 
                                                 *fugitive-:Gsdiff*
-:Gsdiff [revision]      Like |:Gdiff|, but always split horizontally.
+:Gsdiff [revision]      Like |:Gdiff|, but split horizontally.
 
                                                 *fugitive-:Gvdiff*
-:Gvdiff [revision]      Like |:Gdiff|, but always split vertically.
+:Gvdiff [revision]      Identical to |:Gdiff|.  For symmetry with |:Gsdiff|.
 
                                                 *fugitive-:Gmove*
 :Gmove {destination}    Wrapper around git-mv that renames the buffer
@@ -174,18 +169,18 @@ that are part of Git repositories).
 
                                                 *fugitive-:Gblame*
 :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:
+                        scroll bound vertical split.  Press enter on a line to
+                        reblame the file as it was in that commit.  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
+                        i     q, then open commit
                         o     open commit in horizontal split
                         O     open commit in new tab
                         -     reblame at commit
@@ -206,7 +201,7 @@ that are part of Git repositories).
                         To use with GitHub FI, point g:fugitive_github_domains
                         at a list of domains:
 >
-                        let g:fugitive_github_domains = ['https://example.com']
+                        let g:fugitive_github_domains = ['git.example.com']
 ~
 :[range]Gbrowse!        Like :Gbrowse, but put the URL on the clipboard rather
                         than opening it.
@@ -261,10 +256,6 @@ 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.