@matheusbsbs / matheus-bagliano / commits / 4769489a41
Fork 0

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 <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>

Eric Wong committed Nov 23, 2006 at 14:54 UTC 4769489a412fb0decbd73ce59a6756985d0d6bc4
1 file changed +1 -1
git-svn.perl
+1 -1
@@ -623,7 +623,7 @@ sub dcommit {
623 } else {
624 print "No changes between current HEAD and $gs\n",
625 "Hard resetting to the latest $gs\n";
626 - @finish = qw/reset --hard/;
626 + @finish = qw/reset --mixed/;
627 }
628 sys('git', @finish, $gs);
629 }