From: Stephen Haberman <stephen@exigencecorp.com>
Date: Thu, 25 Sep 2008 06:04:02 +0000 (-0500)
Subject: Fix missing tabs.
X-Git-Url: http://git.droids-corp.org/?p=git-central.git;a=commitdiff_plain;h=d89ccdf1c39307a064840a00ef981db7dd4ad11b

Fix missing tabs.
---

diff --git a/server/update-prefer-rebase b/server/update-prefer-rebase
index 9ccf01c..9265dd5 100644
--- a/server/update-prefer-rebase
+++ b/server/update-prefer-rebase
@@ -56,13 +56,13 @@ git rev-parse --not --branches | git rev-list --stdin $oldrev..$newrev | while r
 		git merge-base --all $parents | while read baserev ; do
 			# For each parent
 			git rev-list -n 1 --parents $commit | sed 's/ /\n/g' | grep -v $commit | while read parent ; do
-                parent_is_old=$(git branch --contains $parent | wc -l)
+			parent_is_old=$(git branch --contains $parent | wc -l)
 				all_commits=$(git rev-list --first-parent $baserev..$parent | wc -l)
 				new_commits=$(git rev-parse --not --branches | git rev-list --stdin $baserev..$parent | wc -l)
 				if [ $parent_is_old -gt 0 -a $all_commits -eq $new_commits ] ; then
-                    # echo "parent=$parent"
-                    # echo "all_commits=$all_commits"
-                    # echo "new_commits=$new_commits"
+					# echo "parent=$parent"
+					# echo "all_commits=$all_commits"
+					# echo "new_commits=$new_commits"
 					echo "----------------------------------------------------"
 					echo
 					echo "It looks like you should rebase instead of merging $commit"