diff options
| author | Petr Baudis <pasky@suse.cz> | 2006-09-24 00:25:19 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-23 23:52:53 -0700 |
| commit | 8f41db8c370d535ed0132ef33d73e47edcc5af03 (patch) | |
| tree | 116cbda1095e5c15dbe8374c4196487a776852c2 /git-resolve.sh | |
| parent | 3fc8284e2114624f2657142b3fecdc6f514b2090 (diff) | |
| download | git-8f41db8c370d535ed0132ef33d73e47edcc5af03.tar.gz | |
Deprecate git-resolve.sh
Seriously, is anyone still using this thing? It's collecting dust and
blocking the name for something potentially useful like a tool for
user-friendly marking of resolved conflicts or resolving index conflicts.
We've loved you when Git was young, now thank you and please go away. ;-)
This makes git-resolve.sh print a big deprecation warning and sleep a bit
for extra annoyance. It should be removed completely after the next release.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-resolve.sh')
| -rwxr-xr-x | git-resolve.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-resolve.sh b/git-resolve.sh index a7bc680d90..729ec65dc9 100755 --- a/git-resolve.sh +++ b/git-resolve.sh @@ -5,6 +5,10 @@ # Resolve two trees. # +echo 'WARNING: This command is DEPRECATED and will be removed very soon.' >&2 +echo 'WARNING: Please use git-merge or git-pull instead.' >&2 +sleep 2 + USAGE='<head> <remote> <merge-message>' . git-sh-setup |