From f4e8453ce76d4180c8de6684d0b2cd7c7c2d6b55 Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Mon, 20 Jan 2025 01:19:46 -0500
Subject: [PATCH] Replace cA map with cn

Following Magit's lead.

References: https://github.com/tpope/vim-fugitive/pull/2369
---
 autoload/fugitive.vim | 3 ++-
 doc/fugitive.txt      | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index eb58ced076..82faa8fbca 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -7926,7 +7926,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)
diff --git a/doc/fugitive.txt b/doc/fugitive.txt
index 7d5c10702f..34c861ec1c 100644
--- a/doc/fugitive.txt
+++ b/doc/fugitive.txt
@@ -487,8 +487,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 ".