From 6f68e6f89785b244c0cf5fc1797b44a2dc41b6f2 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Wed, 21 Aug 2013 01:08:04 +0100 Subject: Facepalm. Fix a typo in synthesised commit message. Spell 'Mageia' corretly... /o\ --- scripts/mageia-reset-and-import.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/mageia-reset-and-import.sh b/scripts/mageia-reset-and-import.sh index 33f1c1b..eb42185 100755 --- a/scripts/mageia-reset-and-import.sh +++ b/scripts/mageia-reset-and-import.sh @@ -84,7 +84,7 @@ echo "done" echo echo "OK now the fun stuff beings. You need to find the git commit at which you want" -echo "to start the magiea import. This will typically require some investigation but" +echo "to start the Mageia import. This will typically require some investigation but" echo "the date will be around February 2011." echo "I will drop you to a shell. When you are done, simply copy the SHA1 sum and" echo "exit." @@ -112,7 +112,7 @@ else echo "Is this OK? (press ctrl+c if not)" read -n 1 fi - git update-ref -m "Rewind SVN Git to pre-Magiea import" refs/remotes/trunk $resetsha1 + git update-ref -m "Rewind SVN Git to pre-Mageia import" refs/remotes/trunk $resetsha1 git checkout master git reset --hard trunk @@ -260,7 +260,7 @@ read -n 1 COMMITTXT=$(mktemp /tmp/commitmsg.XXXXXX) cat >$COMMITTXT <