aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2006-11-23 14:54:05 -0800
committerJunio C Hamano <junkio@cox.net>2006-11-23 15:17:46 -0800
commit4769489a412fb0decbd73ce59a6756985d0d6bc4 (patch)
treed746473725aa420aaee958c9b1bbaf6bb7e8a628
parente70dc780a4325138ddfae6786c1eb3ec06233de6 (diff)
downloadgit-4769489a412fb0decbd73ce59a6756985d0d6bc4.tar.gz
git-4769489a412fb0decbd73ce59a6756985d0d6bc4.tar.xz
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>
-rwxr-xr-xgit-svn.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl
index 6feae56c0..bb8935afe 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);
}