mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-26 07:06:13 +02:00
Code

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>
This commit is contained in:
Petr Baudis 2006-09-24 00:25:19 +02:00 committed by Junio C Hamano
parent 3fc8284e21
commit 8f41db8c37
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-resolve.sh
View File

@ -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