Merge branch 'nd/sparse-doc' into maint-1.7.6

diff --git a/t/t1412-reflog-loop.sh b/t/t1412-reflog-loop.sh
index 7f519e5ebeac0780aee1c6d9c4458e00b62a273d..647d888507a4b74b82ae4016c2f30f7d171e98ca 100755 (executable)
--- a/t/t1412-reflog-loop.sh
+++ b/t/t1412-reflog-loop.sh
@@ -21,10 +21,10 @@ test_expect_success 'setup reflog with alternating commits' '
 
 test_expect_success 'reflog shows all entries' '
        cat >expect <<-\EOF
-               topic@{0} two: updating HEAD
-               topic@{1} one: updating HEAD
-               topic@{2} two: updating HEAD
-               topic@{3} one: updating HEAD
+               topic@{0} reset: moving to two
+               topic@{1} reset: moving to one
+               topic@{2} reset: moving to two
+               topic@{3} reset: moving to one
                topic@{4} branch: Created from HEAD
        EOF
        git log -g --format="%gd %gs" topic >actual &&