Re: Potential git bug

2018-03-19 Thread Jeff King 
On Mon, Mar 19, 2018 at 04:14:31PM -0400, Nick Hunt wrote:

> oh, wait, switching branches didn't vaporize my changes, it auto-committed 
> them.
> which is still weird and possibly a bug?

Are you sure that the changes were not already present on the
switched-to branch?

-Peff

Re: Potential git bug

2018-03-19 Thread Nick Hunt 
oh, wait, switching branches didn't vaporize my changes, it auto-committed them.
which is still weird and possibly a bug?
Nick Hunt
nhun...@gmail.com
404-988-1845


On Mon, Mar 19, 2018 at 3:13 PM, Nick Hunt  wrote:
> i committed my changes, then ran
> git reset --soft HEAD^
> at this point everything is fine
> then i switched branches, and all of my changes vaporized into thin
> air. uhhh, is this supposed to happen?
>
> anyway, thank god intellij saves my work for me as i go, so i didn't
> have to re-write all my code.
>
> my bash/zsh commands are attached.
>
> thanks for the help! :)