Merge 9e8859d666 into d74a7cff4c

References: https://github.com/tpope/vim-fugitive/pull/2369

LICENSE

@@ -0,0 +1,81 @@
+VIM LICENSE
+
+I)  There are no restrictions on distributing unmodified copies of
+    fugitive.vim except that they must include this license text.  You can
+    also distribute unmodified parts of fugitive.vim, likewise unrestricted
+    except that they must include this license text.  You are also allowed to
+    include executables that you made from the unmodified fugitive.vim
+    sources, plus your own usage examples and Vim scripts.
+
+II) It is allowed to distribute a modified (or extended) version of
+    fugitive.vim, including executables and/or source code, when the following
+    four conditions are met:
+    1) This license text must be included unmodified.
+    2) The modified fugitive.vim must be distributed in one of the following
+       five ways:
+       a) If you make changes to fugitive.vim yourself, you must clearly
+          describe in the distribution how to contact you.  When the
+          maintainer asks you (in any way) for a copy of the modified
+          fugitive.vim you distributed, you must make your changes, including
+          source code, available to the maintainer without fee.  The
+          maintainer reserves the right to include your changes in the
+          official version of fugitive.vim.  What the maintainer will do with
+          your changes and under what license they will be distributed is
+          negotiable.  If there has been no negotiation then this license, or
+          a later version, also applies to your changes. The current
+          maintainer is Bram Moolenaar <Bram@vim.org>.  If this changes it
+          will be announced in appropriate places (most likely vim.sf.net,
+          www.vim.org and/or comp.editors). When it is completely impossible
+          to contact the maintainer, the obligation to send him your changes
+          ceases.  Once the maintainer has confirmed that he has received your
+          changes they will not have to be sent again.
+       b) If you have received a modified fugitive.vim that was distributed as
+          mentioned under a) you are allowed to further distribute it
+          unmodified, as mentioned at I).  If you make additional changes the
+          text under a) applies to those changes.
+       c) Provide all the changes, including source code, with every copy of
+          the modified fugitive.vim you distribute.  This may be done in the
+          form of a context diff.  You can choose what license to use for new
+          code you add.  The changes and their license must not restrict
+          others from making their own changes to the official version of
+          fugitive.vim.
+       d) When you have a modified fugitive.vim which includes changes as
+          mentioned under c), you can distribute it without the source code
+          for the changes if the following three conditions are met:
+          - The license that applies to the changes permits you to distribute
+            the changes to the Vim maintainer without fee or restriction, and
+            permits the Vim maintainer to include the changes in the official
+            version of fugitive.vim without fee or restriction.
+          - You keep the changes for at least three years after last
+            distributing the corresponding modified fugitive.vim.  When the
+            maintainer or someone who you distributed the modified
+            fugitive.vim to asks you (in any way) for the changes within this
+            period, you must make them available to him.
+          - You clearly describe in the distribution how to contact you.  This
+            contact information must remain valid for at least three years
+            after last distributing the corresponding modified fugitive.vim,
+            or as long as possible.
+       e) When the GNU General Public License (GPL) applies to the changes,
+          you can distribute the modified fugitive.vim under the GNU GPL
+          version 2 or any later version.
+    3) A message must be added, at least in the output of the ":version"
+       command and in the intro screen, such that the user of the modified
+       fugitive.vim is able to see that it was modified.  When distributing as
+       mentioned under 2)e) adding the message is only required for as far as
+       this does not conflict with the license used for the changes.
+    4) The contact information as required under 2)a) and 2)d) must not be
+       removed or changed, except that the person himself can make
+       corrections.
+
+III) If you distribute a modified version of fugitive.vim, you are encouraged
+     to use the Vim license for your changes and make them available to the
+     maintainer, including the source code.  The preferred way to do this is
+     by e-mail or by uploading the files to a server and e-mailing the URL. If
+     the number of changes is small (e.g., a modified Makefile) e-mailing a
+     context diff will do.  The e-mail address to be used is
+     <maintainer@vim.org>
+
+IV)  It is not allowed to remove this license from the distribution of the
+     fugitive.vim sources, parts of it or from a modified version.  You may
+     use this license for previous fugitive.vim releases instead of the
+     license that they came with, at your option.

autoload/fugitive.vim

@@ -5191,7 +5191,7 @@ function! s:DoToggleHeadHeader(value) abort
 endfunction
 
 function! s:DoToggleHelpHeader(value) abort
-  exe 'help fugitive-map'
+  exe 'help fugitive-maps'
 endfunction
 
 function! s:DoStagePushHeader(value) abort
@@ -7917,6 +7917,7 @@ function! s:MapGitOps(is_ftplugin) abort
   exe s:Map('n', 'cc', ':<C-U>Git commit<CR>', '<silent>', ft)
   exe s:Map('n', 'ce', ':<C-U>Git commit --amend --no-edit<CR>', '<silent>', ft)
   exe s:Map('n', 'cw', ':<C-U>Git commit --amend --only<CR>', '<silent>', ft)
+  exe s:Map('n', 'cW', ':<C-U>Git commit --fixup=reword:<C-R>=<SID>SquashArgument()<CR>', '', ft)
   exe s:Map('n', 'cva', ':<C-U>tab Git commit -v --amend<CR>', '<silent>', ft)
   exe s:Map('n', 'cvc', ':<C-U>tab Git commit -v<CR>', '<silent>', ft)
   exe s:Map('n', 'cRa', ':<C-U>Git commit --reset-author --amend<CR>', '<silent>', ft)
@@ -7926,7 +7927,8 @@ function! s:MapGitOps(is_ftplugin) abort
   exe s:Map('n', 'cF', ':<C-U><Bar>Git -c sequence.editor=true rebase --interactive --autosquash<C-R>=<SID>RebaseArgument()<CR><Home>Git commit --fixup=<C-R>=<SID>SquashArgument()<CR>', '', ft)
   exe s:Map('n', 'cs', ':<C-U>Git commit --no-edit --squash=<C-R>=<SID>SquashArgument()<CR>', '', ft)
   exe s:Map('n', 'cS', ':<C-U><Bar>Git -c sequence.editor=true rebase --interactive --autosquash<C-R>=<SID>RebaseArgument()<CR><Home>Git commit --no-edit --squash=<C-R>=<SID>SquashArgument()<CR>', '', ft)
-  exe s:Map('n', 'cA', ':<C-U>Git commit --edit --squash=<C-R>=<SID>SquashArgument()<CR>', '', ft)
+  exe s:Map('n', 'cn', ':<C-U>Git commit --edit --squash=<C-R>=<SID>SquashArgument()<CR>', '', ft)
+  exe s:Map('n', 'cA', ':<C-U>echoerr "Use cn"<CR>', '<silent><unique>', ft)
   exe s:Map('n', 'c?', ':<C-U>help fugitive_c<CR>', '<silent>', ft)
 
   exe s:Map('n', 'cr<Space>', ':Git revert<Space>', '', ft)
@@ -8045,8 +8047,8 @@ function! fugitive#MapJumps(...) abort
 
     call s:Map('n', '.',     ":<C-U> <C-R>=<SID>fnameescape(fugitive#Real(@%))<CR><Home>")
     call s:Map('x', '.',     ":<C-U> <C-R>=<SID>fnameescape(fugitive#Real(@%))<CR><Home>")
-    call s:Map('n', 'g?',    ":<C-U>help fugitive-map<CR>", '<silent>')
-    call s:Map('n', '<F1>',  ":<C-U>help fugitive-map<CR>", '<silent>')
+    call s:Map('n', 'g?',    ":<C-U>help fugitive-maps<CR>", '<silent>')
+    call s:Map('n', '<F1>',  ":<C-U>help fugitive-maps<CR>", '<silent>')
   endif
 
   let old_browsex = maparg('<Plug>NetrwBrowseX', 'n')

doc/fugitive.txt

@@ -465,15 +465,18 @@ Commit maps ~
 
 cc                      Create a commit.
 
+cvc                     Create a commit with -v.
+
 ca                      Amend the last commit and edit the message.
 
+cva                     Amend the last commit with -v.
+
 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
+cW                      Create an `amend!` commit that rewords the commit
+                        under the cursor.
 
 cf                      Create a `fixup!` commit for the commit under the
                         cursor.
@@ -487,8 +490,8 @@ cs                      Create a `squash!` commit for the commit under the
 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.
+cn                      Create a `squash!` commit for the commit under the
+(formerly cA)           cursor and edit the message.
 
 c<Space>                Populate command line with ":Git commit ".