On Mon, Feb 16, 2015 at 7:10 PM, Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> wrote: >> We should definitely make recovery like this harder, but is there a >> reason for why you don't use "git reset --keep" instead of --hard? >> It'll keep any local changes to your index/staging area, and reset the >> files that don't conflict, if there's any conflicts the operation will >> be aborted. > > "Recovery like this easier", i.e. make it easier to get back > previously staged commits / blobs. I started with git-undo (or what's its name) a while back (*). The idea is for dangerous commands like this we could save some data back, which would be pruned after some time. Saving stuff in index is quite easy because they are already in object database. For this reset --hard, we may need to hash/store some more blobs. I think it's worth the safety. Not sure if anyone's interested in continuing that work. (*) found it: http://thread.gmane.org/gmane.comp.version-control.git/231621/focus=231879 -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html