Merge branch 'rh/merge-options-doc-fix' into maint

diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index 3a5d0fd77016d58ea11fe205dd0a28857a236632..f698001c996ea20847c574f04dad9a65684f324f 100755 (executable)
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -572,6 +572,10 @@ test_expect_success 'log grep (9)' '
        test_cmp expect actual
 '
 
+test_expect_success 'log --grep-reflog can only be used under -g' '
+       test_must_fail git log --grep-reflog="commit: third"
+'
+
 test_expect_success 'log with multiple --grep uses union' '
        git log --grep=i --grep=r --format=%s >actual &&
        {