diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-11-23 14:54:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-23 15:17:46 -0800 |
| commit | 4769489a412fb0decbd73ce59a6756985d0d6bc4 (patch) | |
| tree | d746473725aa420aaee958c9b1bbaf6bb7e8a628 /builtin-blame.c | |
| parent | e70dc780a4325138ddfae6786c1eb3ec06233de6 (diff) | |
| download | git-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>
Diffstat (limited to 'builtin-blame.c')
0 files changed, 0 insertions, 0 deletions