From 4769489a412fb0decbd73ce59a6756985d0d6bc4 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 23 Nov 2006 14:54:05 -0800 Subject: [PATCH] git-svn: preserve uncommitted changes after dcommit Using dcommit could cause the user to lose uncommitted changes during the reset --hard operation, so change it to reset --mixed. If dcommit chooses the rebase path, then git-rebase will already error out when local changes are made. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- git-svn.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-svn.perl b/git-svn.perl index 6feae56c0e..bb8935afe6 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -623,7 +623,7 @@ sub dcommit { } else { print "No changes between current HEAD and $gs\n", "Hard resetting to the latest $gs\n"; - @finish = qw/reset --hard/; + @finish = qw/reset --mixed/; } sys('git', @finish, $gs); } -- 2.11.4.GIT