Andrew's git / gitweb.git / diff
?
Merge branch 'bs/maint-commit-options'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Nov 2007 22:25:46 +0000 (14:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Nov 2007 22:25:46 +0000 (14:25 -0800)
* 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

1  2 
git-commit.sh patch | diff1 | diff2 | blob | history
t/t7501-commit.sh patch | diff1 | diff2 | blob | history
diff --cc git-commit.sh
Simple merge
diff --cc t/t7501-commit.sh
Simple merge