From: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon, 9 Nov 2009 15:05:04 +0000 (-0600)
Subject: diff --no-index: make the usage string less scary
X-Git-Tag: v1.6.6-rc0~34^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d74bb308fa9e49e0a5b9a0792e6079bbc0c8aea8;p=git.git

diff --no-index: make the usage string less scary

Start the diff --no-index usage string with "usage:" instead of
"fatal:".

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/diff-no-index.c b/diff-no-index.c
index 4ebc1dbd8..aae8e7acc 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -201,8 +201,8 @@ void diff_no_index(struct rev_info *revs,
 			return;
 	}
 	if (argc != i + 2)
-		die("git diff %s takes two paths",
-		    no_index ? "--no-index" : "[--no-index]");
+		usagef("git diff %s <path> <path>",
+		       no_index ? "--no-index" : "[--no-index]");
 
 	diff_setup(&revs->diffopt);
 	for (i = 1; i < argc - 2; ) {