Sync with 1.6.5.6

diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index e931ce6c69c8819b4273e0c81eb17bf8d8eacc5d..fd166d9de356dafb000504506285a6f77fcc0a37 100755 (executable)
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -158,7 +158,7 @@ cat > test/expect << EOF
     another
     master
   Local refs configured for 'git push':
-    ahead  forces to master  (fast forwardable)
+    ahead  forces to master  (fast-forwardable)
     master pushes to another (up to date)
 EOF