From: Stephen Haberman Date: Tue, 24 Jun 2008 17:18:16 +0000 (-0500) Subject: Another comment. X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=31b481f0dff7002b9d5959af6b44a4b81416de4a;p=git-central.git Another comment. --- diff --git a/server/update-prefer-rebase b/server/update-prefer-rebase index 5ae3d84..5d9948a 100644 --- a/server/update-prefer-rebase +++ b/server/update-prefer-rebase @@ -41,6 +41,7 @@ if expr "$oldrev" : '0*$' >/dev/null ; then exit 0 fi +# Read backwards: all commits from old..new, unless they are already referenced by a branch git rev-parse --not --branches | git rev-list --stdin $oldrev..$newrev | while read commit ; do number_of_parents=$(git rev-list -n 1 --parents $commit | sed 's/ /\n/g' | grep -v $commit | wc -l) if [[ $number_of_parents > 1 ]] ; then