Signed-off-by: Jari Aalto <jari.aalto@xxxxxxxxx> --- git-rebase--interactive.sh | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 050140d..58e164c 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -10,6 +10,8 @@ # The original idea comes from Eric W. Biederman, in # http://article.gmane.org/gmane.comp.version-control.git/22407 +TAIL="tail" + USAGE='(--continue | --abort | --skip | [--preserve-merges] [--verbose] [--onto <branch>] <upstream> [<branch>])' @@ -204,7 +206,7 @@ nth_string () { make_squash_message () { if test -f "$SQUASH_MSG"; then COUNT=$(($(sed -n "s/^# This is [^0-9]*\([1-9][0-9]*\).*/\1/p" \ - < "$SQUASH_MSG" | tail -n 1)+1)) + < "$SQUASH_MSG" | $TAIL 1)+1)) echo "# This is a combination of $COUNT commits." sed -n "2,\$p" < "$SQUASH_MSG" else -- 1.5.3.2.81.g17ed - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html