| commit | 4769489a412fb0decbd73ce59a6756985d0d6bc4 | |
| author | Eric Wong <normalperson@yhbt.net> | |
| Thu, 23 Nov 2006 22:54:05 +0000 (23 14:54 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 23 Nov 2006 23:17:46 +0000 (23 15:17 -0800) | ||
| tree | d746473725aa420aaee958c9b1bbaf6bb7e8a628 | treesnapshot (tar.gz zip) |
| parent | e70dc780a4325138ddfae6786c1eb3ec06233de6 | commitdiff |
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>
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>
| git-svn.perl | diffblobblamehistory |