From d5e615c26a3ac8476ca02831a55d4f870506eb9e Mon Sep 17 00:00:00 2001
From: Evan Broder <broder@mit.edu>
Date: Wed, 24 Dec 2008 23:33:24 -0500
Subject: [PATCH] Newer versions of git are more clever.

svn path=/trunk/scripts/git-migration/; revision=1888
---
 git-migrate |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-migrate b/git-migrate
index 796f937..e61f380 100755
--- a/git-migrate
+++ b/git-migrate
@@ -32,7 +32,7 @@ def clonePackage(base, pkg):
                          stdout=subprocess.PIPE)
     p.wait()
     if len(p.stdout.read()) == 0:
-        subprocess.check_call(['git', 'reset', 'HEAD^'],
+        subprocess.check_call(['git', 'reset', '--soft', 'HEAD^'],
                               cwd='%s.git' % pkg)
 
 def cloneAllPackages(base):
-- 
1.7.9.5