From: Junio C Hamano <junkio@cox.net>
Date: Wed, 30 Nov 2005 19:09:33 +0000 (-0800)
Subject: Merge branch 'jc/subdir'
X-Git-Tag: v0.99.9l^2~23
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9cac9d368934f68e75810df95211a6522d4d139e;p=git.git

Merge branch 'jc/subdir'
---

9cac9d368934f68e75810df95211a6522d4d139e
diff --cc git-diff.sh
index 7baf7044e,e45f50ec2..b62e58341
--- a/git-diff.sh
+++ b/git-diff.sh
@@@ -7,6 -7,13 +7,11 @@@ rev=$(git-rev-parse --revs-only --no-fl
  flags=$(git-rev-parse --no-revs --flags --sq "$@")
  files=$(git-rev-parse --no-revs --no-flags --sq "$@")
  
 -: ${flags:="'-M' '-p'"}
 -
+ die () {
+     echo >&2 "$*"
+     exit 1
+ }
+ 
  # I often say 'git diff --cached -p' and get scolded by git-diff-files, but
  # obviously I mean 'git diff --cached -p HEAD' in that case.
  case "$rev" in