зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
e70dc780a4
Коммит
4769489a41
|
@ -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);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче