X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=templates%2Fhooks--update;h=3f38b82a4710400e512d478ec6b552202a34369f;hb=0090a6185af18a199d5bc12781adf411177f1e1a;hp=0726975367de1bff2d4575537f89f52ff87fa1a7;hpb=c65a9470fbaa57b9b815addde51ad22648f6d353;p=git.git diff --git a/templates/hooks--update b/templates/hooks--update index 072697536..3f38b82a4 100644 --- a/templates/hooks--update +++ b/templates/hooks--update @@ -16,10 +16,14 @@ then git-rev-list --pretty "$3" else $base=$(git-merge-base "$2" "$3") - if [ $base == "$2" ]; then + case "$base" in + "$2") echo "New commits:" - else + ;; + *) echo "Rebased ref, commits from common ancestor:" + ;; + esac fi git-rev-list --pretty "$3" "^$base" fi |