be3ca74be95c4f6ae48f211f102a968415edb84e
galt
  Wed Jun 30 19:14:00 2010 -0700
handling plurals for gilt
diff --git src/utils/gitTools/gilt src/utils/gitTools/gilt
index f545871..b642736 100755
--- src/utils/gitTools/gilt
+++ src/utils/gitTools/gilt
@@ -34,9 +34,19 @@
     echo "Your branch and 'origin/master' have diverged,"
     echo "and have $mymaster and $omaster different commit(s) each, respectively."
 elif [ "$mymaster" -eq "0" ] && [ "$omaster" -gt "0" ]; then
-    echo "Your branch is behind 'origin/master' by $omaster commits, and can be fast-forwarded."
+    if [ "$omaster" -eq "1" ]; then
+	plural=""
+    else
+	plural="s"
+    fi
+    echo "Your branch is behind 'origin/master' by $omaster commit$plural, and can be fast-forwarded."
 elif [ "$mymaster" -gt "0" ] && [ "$omaster" -eq "0" ]; then
-    echo "Your branch is ahead of 'origin/master' by $mymaster commits."
+    if [ "$mymaster" -eq "1" ]; then
+	plural=""
+    else
+	plural="s"
+    fi
+    echo "Your branch is ahead of 'origin/master' by $mymaster commit$plural."
 fi
 
 if [ -n "$staged" ]; then