From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: gitster@pobox.com, git@vger.kernel.org
Cc: Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: [PATCH] Mention the fact that 'git annotate' is only for backward compatibility.
Date: Thu, 4 Sep 2008 15:03:41 +0200 [thread overview]
Message-ID: <1220533421-26057-1-git-send-email-Matthieu.Moy@imag.fr> (raw)
In-Reply-To: <20080904123046.GX10544@machine.or.cz>
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
next prev parent reply other threads:[~2008-09-04 13:07 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-03 16:43 blame vs annotate? Jonathan del Strother
2008-09-03 17:49 ` Miklos Vajna
2008-09-03 17:54 ` Petr Baudis
2008-09-03 18:10 ` Junio C Hamano
2008-09-04 9:09 ` Matthieu Moy
2008-09-04 9:16 ` Sverre Rabbelier
2008-09-04 12:00 ` [PATCH] Mention the fact that 'git annotate' is only for backward compatibility Matthieu Moy
2008-09-04 12:30 ` Petr Baudis
2008-09-04 13:03 ` Matthieu Moy [this message]
2008-09-04 19:12 ` Junio C Hamano
2008-09-04 19:17 ` Junio C Hamano
2008-09-05 6:31 ` Matthieu Moy
2008-09-05 7:29 ` Junio C Hamano
2008-09-05 8:07 ` Petr Baudis
2008-09-05 12:06 ` Matthieu Moy
2008-09-05 7:56 ` Junio C Hamano
2008-09-03 18:11 ` blame vs annotate? Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1220533421-26057-1-git-send-email-Matthieu.Moy@imag.fr \
--to=matthieu.moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).