[PATCH] Mention the fact that 'git annotate' is only for backward compatibility.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
Documentation/git-annotate.txt | 4 ++++
command-list.txt | 2 +-
contrib/completion/git-completion.bash | 1 +
3 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt
index 8b6b56a..76f2b8c 100644
--- a/Documentation/git-annotate.txt
+++ b/Documentation/git-annotate.txt
@@ -14,6 +14,10 @@ DESCRIPTION
Annotates each line in the given file with information from the commit
which introduced the line. Optionally annotate from a given revision.
+This command exists for backward compatibility, as an alias for 'git
+blame -c'. For regular use, you should now use linkgit:git-blame[1]
+instead.
+
OPTIONS
-------
include::blame-options.txt[]
diff --git a/command-list.txt b/command-list.txt
index 3583a33..03d1023 100644
--- a/command-list.txt
+++ b/command-list.txt
@@ -2,7 +2,7 @@
# command name category [deprecated] [common]
git-add mainporcelain common
git-am mainporcelain
-git-annotate ancillaryinterrogators
+git-annotate ancillaryinterrogators deprecated
git-apply plumbingmanipulators
git-archimport foreignscminterface
git-archive mainporcelain
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 4f64f8a..6630033 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -380,6 +380,7 @@ __git_porcelain_commands ()
do
case $i in
*--*) : helper pattern;;
+ annotate) : deprecated;;
applymbox) : ask gittus;;
applypatch) : ask gittus;;
archimport) : import;;
--
1.6.0.7.g161c
Matthieu Moy <matthieu.moy@imag.fr>