From: Eric Wong <normalperson@yhbt.net>
Date: Thu, 23 Nov 2006 22:54:05 +0000 (-0800)
Subject: git-svn: preserve uncommitted changes after dcommit
X-Git-Tag: v1.4.4.2~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4769489a412fb0decbd73ce59a6756985d0d6bc4?hp=4769489a412fb0decbd73ce59a6756985d0d6bc4

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>
---