Merge branch 'mz/pull-rebase-rebased'

diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index dae635851666a7f5ccf685b89d64f31d5dbdd2fd..9a665205884fcdb1c5888558d6edf960e335e013 100755 (executable)
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -208,7 +208,11 @@ log -p --first-parent master
 log -m -p --first-parent master
 log -m -p master
 log -SF master
+log -S F master
 log -SF -p master
+log -GF master
+log -GF -p master
+log -GF -p --pickaxe-all master
 log --decorate --all
 log --decorate=full --all
 
@@ -282,4 +286,8 @@ diff master master^ side
 diff --dirstat master~1 master~2
 EOF
 
+test_expect_success 'log -S requires an argument' '
+       test_must_fail git log -S
+'
+
 test_done