Re: Experience with Recovering From User Error (And suggestions for improvements)

2015-02-19 Thread Michael J Gruber
Kyle J. McKay venit, vidit, dixit 19.02.2015 02:17: On Feb 18, 2015, at 01:46, Michael J Gruber wrote: Armin Ronacher venit, vidit, dixit 16.02.2015 14:29: Hi, On 16/02/15 13:09, Ævar Arnfjörð Bjarmason wrote: We should definitely make recovery like this harder, but is there a reason for

Re: Experience with Recovering From User Error (And suggestions for improvements)

2015-02-18 Thread Michael J Gruber
Armin Ronacher venit, vidit, dixit 16.02.2015 14:29: Hi, On 16/02/15 13:09, Ævar Arnfjörð Bjarmason 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? This was only the second time in years of git usage

Re: Experience with Recovering From User Error (And suggestions for improvements)

2015-02-16 Thread Duy Nguyen
On Mon, Feb 16, 2015 at 7:10 PM, Ævar Arnfjörð Bjarmason ava...@gmail.com 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

Re: Experience with Recovering From User Error (And suggestions for improvements)

2015-02-16 Thread Armin Ronacher
Hi, On 16/02/15 13:09, Ævar Arnfjörð Bjarmason 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? This was only the second time in years of git usage that the reset was incorrectly done. I suppose at this

Experience with Recovering From User Error (And suggestions for improvements)

2015-02-16 Thread Armin Ronacher
Hi, Long story short: I failed big time yesterday with accidentally executing git reset hard in the wrong terminal window but managed to recover my changes from the staging area by manually examining blobs touched recently. After that however I figured I might want to add a precaution for

Re: Experience with Recovering From User Error (And suggestions for improvements)

2015-02-16 Thread Ævar Arnfjörð Bjarmason
On Mon, Feb 16, 2015 at 11:41 AM, Armin Ronacher armin.ronac...@active-4.com wrote: Long story short: I failed big time yesterday with accidentally executing git reset hard in the wrong terminal window but managed to recover my changes from the staging area by manually examining blobs touched

Re: Experience with Recovering From User Error (And suggestions for improvements)

2015-02-16 Thread Ævar Arnfjörð Bjarmason
On Mon, Feb 16, 2015 at 1:09 PM, Ævar Arnfjörð Bjarmason ava...@gmail.com wrote: On Mon, Feb 16, 2015 at 11:41 AM, Armin Ronacher armin.ronac...@active-4.com wrote: Long story short: I failed big time yesterday with accidentally executing git reset hard in the wrong terminal window but managed