summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2010-01-14 06:54:49 +0100
committerJunio C Hamano <gitster@pobox.com>2010-01-14 00:27:56 -0800
commit5065ed296abc1c0b66ad7c5e963e048cb90b6ee6 (patch)
treec8be8caa8ff2a72c1616cdf52484b0291340d370 /git-rebase--interactive.sh
parent959c0d06eafd7723517c953e80ee1a60881c373b (diff)
downloadgit-5065ed296abc1c0b66ad7c5e963e048cb90b6ee6.tar.gz
rebase -i: Improve consistency of commit count in generated commit messages
Use the numeral "2" instead of the word "two" when two commits are being interactively squashed. This makes the treatment consistent with that for higher numbers of commits. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
-rwxr-xr-xgit-rebase--interactive.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 31f9b3b038..702c979414 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -360,7 +360,7 @@ make_squash_message () {
}' <"$SQUASH_MSG"
else
COUNT=2
- echo "# This is a combination of two commits."
+ echo "# This is a combination of 2 commits."
echo "# The first commit's message is:"
echo
git cat-file commit HEAD | sed -e '1,/^$/d'