Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-svn: preserve uncommitted changes after dcommit
author
Eric Wong
<normalperson@yhbt.net>
Thu, 23 Nov 2006 22:54:05 +0000
(14:54 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Thu, 23 Nov 2006 23:17:46 +0000
(15:17 -0800)
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
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
e70dc78
)
diff --git
a/git-svn.perl
b/git-svn.perl
index 6feae56c0eb9856f018da33a4a1461be7c01373d..bb8935afe6ab9eb67ae19b13a040cebe54246c37 100755
(executable)
--- 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 --
har
d/;
+ @finish = qw/reset --
mixe
d/;
}
sys('git', @finish, $gs);
}