Merge branch 'nd/doc-git-index-version'

diff --git a/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh
index 2602086303edeae192606d82d7fd1e71ac76534f..1f58b46e1f1300b7e893f16b92c40f4c2a09b014 100755 (executable)
--- a/t/t6000-rev-list-misc.sh
+++ b/t/t6000-rev-list-misc.sh
@@ -96,4 +96,8 @@ test_expect_success 'rev-list can show index objects' '
        test_cmp expect actual
 '
 
+test_expect_success '--bisect and --first-parent can not be combined' '
+       test_must_fail git rev-list --bisect --first-parent HEAD
+'
+
 test_done