Re: Git reset --hard with staged changes

untracked files, one could expect having staged untracked files reset to their previous untracked state rather than being deleted. Could this be a bug or a missing feature? Or if it isn't, can someone explain what we got wrong? Cheers -- Pierre-François CLEMENT Application developer at Upcast Social

Re: Git reset --hard with staged changes

2014-06-09 16:04 GMT+02:00 David Kastrup d...@gnu.org: Pierre-François CLEMENT lik...@gmail.com writes: Hi all, Someone pointed out on the Git for human beings Google group (https://groups.google.com/d/topic/git-users/27_FxIV_100/discussion) that using git-reset's hard mode when having

Re: Git reset --hard with staged changes

2014-06-10 1:28 GMT+02:00 Junio C Hamano gits...@pobox.com: Pierre-François CLEMENT lik...@gmail.com writes: Hm, I didn't think of git apply --index... Makes sense for this special use, but I'm not sure about the other use cases. Try merging another branch that tracks a file your current

Re: Git reset --hard with staged changes

2014-06-10 17:27 GMT+02:00 David Kastrup d...@gnu.org: Pierre-François CLEMENT lik...@gmail.com writes: 2014-06-10 1:28 GMT+02:00 Junio C Hamano gits...@pobox.com: Pierre-François CLEMENT lik...@gmail.com writes: Hm, I didn't think of git apply --index... Makes sense for this special use