From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 25 Nov 2007 01:54:08 +0000 (-0800)
Subject: Merge branch 'bs/maint-commit-options' into maint
X-Git-Tag: v1.5.3.7~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=89919f4f57006358c278c1f207249edcccbe68c4;p=git.git

Merge branch 'bs/maint-commit-options' into maint

* bs/maint-commit-options:
  git-commit: Add tests for invalid usage of -a/--interactive with paths
  git-commit.sh: Fix usage checks regarding paths given when they do not make sense
---

89919f4f57006358c278c1f207249edcccbe68c4
diff --cc t/t7501-commit.sh
index b151b51a3,7f25689bb..7f25689bb
mode 100755,100644..100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh