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: N Petr Baudis <pasky@suse.cz> Signed-off-by: N Junio C Hamano <junkio@cox.net>

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: N Petr Baudis <pasky@suse.cz> Signed-off-by: N Junio C Hamano <junkio@cox.net>
8f41db8c · Petr Baudis · Junio C Hamano · 3fc8284e · 8f41db8c
隐藏空白更改
内联并排

Showing with 4 addition and 0 deletion

git-resolve.sh git-resolve.sh +4 -0

未找到文件。
--- 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