[Emms-patches] Re: Sorry ...

[Tim Landscheidt]

Yoni Rabkin <address@hidden> wrote:

>> ... I screwed up. I tried very hard to push only changes to
>> the autotools branch, even using a temporary clone in a dif-
>> ferent directory, but somehow my scratchpad got pushed as
>> well.

>>   If someone has the knowledge and karma to reset the master
>> branch to the last "good" commit, I'd be eternally grateful.

> I'm no git expert so I won't try to undo whatever, but isn't this what
> "git reset --hard [UUID]" is for?

Locally? Probably. But will a subsequent push reset the re-
pository master as well?

Tim

P. S.: Likely course of events: Working in the temporary
       clone using "push autotools" was fine, so somewhere
       along the line I switched to my scratchpad where
       "pull/push autotools" worked as well, then a "push"
       without a branch in the temporary clone pushed only
       autotools changes (the only changes there), so I got
       inattentive and "pushed" without arguments in my
       scratchpad as well (which pushes all branches that
       have corresponding remote branches). Lesson learned:
       *Never* work on master, *always* on a local branch.