From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 5 Feb 2007 20:44:30 +0000 (-0500)
Subject: bash: Hide git-resolve, its deprecated.
X-Git-Tag: v1.5.0-rc4~39
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e459415c9c3c8e855998dd0247f23d32a0dca4ff;p=git.git

bash: Hide git-resolve, its deprecated.

Don't offer resolve as a possible subcommand completion.  If you
read the top of the script, there is a big warning about how it
will go away soon in the near future.  People should not be using it.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 324bfbd8b..089a7b057 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -297,6 +297,7 @@ __git_commands ()
 		reflog)           : plumbing;;
 		repo-config)      : plumbing;;
 		rerere)           : plumbing;;
+		resolve)          : dead dont use;;
 		rev-list)         : plumbing;;
 		rev-parse)        : plumbing;;
 		runstatus)        : plumbing;;