path: root/t
diff options
authorFelipe Contreras <>2009-10-24 08:31:32 (GMT)
committerJunio C Hamano <>2009-10-25 06:50:28 (GMT)
commita75d7b54097ef0d0945cbe673a9940d6c561f95c (patch)
tree40d03cbf093fd503448d31d3a71319be3f1d4fac /t
parent78d553b7d7b269bb22ebd8b1198657c37484a3a0 (diff)
Use 'fast-forward' all over the place
It's a compound word. Signed-off-by: Felipe Contreras <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 't')
4 files changed, 6 insertions, 6 deletions
diff --git a/t/ b/t/
index 271bc4e..c2d408b 100755
--- a/t/
+++ b/t/
@@ -5,7 +5,7 @@
test_description='Two way merge with read-tree -m $H $M
-This test tries two-way merge (aka fast forward with carry forward).
+This test tries two-way merge (aka fast-forward with carry forward).
There is the head (called H) and another commit (called M), which is
simply ahead of H. The index and the work tree contains a state that
@@ -51,7 +51,7 @@ check_cache_at () {
cat >bozbar-old <<\EOF
-This is a sample file used in two-way fast forward merge
+This is a sample file used in two-way fast-forward merge
tests. Its second line ends with a magic word bozbar
which will be modified by the merged head to gnusto.
It has some extra lines so that external tools can
@@ -300,7 +300,7 @@ test_expect_success \
echo gnusto gnusto >bozbar &&
if read_tree_twoway $treeH $treeM; then false; else :; fi'
-# This fails with straight two-way fast forward.
+# This fails with straight two-way fast-forward.
test_expect_success \
'22 - local change cache updated.' \
'rm -f .git/index &&
diff --git a/t/ b/t/
index 852ccb5..220b6a3 100755
--- a/t/
+++ b/t/
@@ -158,7 +158,7 @@ cat > test/expect << EOF
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)
diff --git a/t/ b/t/
index c6bc65f..c2060bb 100755
--- a/t/
+++ b/t/
@@ -22,7 +22,7 @@ test_expect_success setup '
git commit -a -m next
-test_expect_success 'non fast forward fetch' '
+test_expect_success 'non-fast-forward fetch' '
test_must_fail git fetch . master:side
diff --git a/t/ b/t/
index f8f3e3f..a91644e 100755
--- a/t/
+++ b/t/
@@ -1,6 +1,6 @@
-test_description='merge fast forward and up to date'
+test_description='merge fast-forward and up to date'
. ./