Michel Dänzer wrote: > On Mon, 2007-05-21 at 10:13 -0600, Brian Paul wrote: >> Michel Dänzer wrote: >>> On Mon, 2007-05-21 at 09:22 -0600, Brian Paul wrote: >>>> Julien Cristau wrote: >>>>> On Mon, May 21, 2007 at 09:04:00 -0600, Brian Paul wrote: >>> Force-pushing to a shared repository is bad. Everybody should make sure >>> their configuration doesn't force-push by default, and if git-push >>> fails, don't use git-push -f. >> I've never used git-push -f > > Didn't say you did, that was just a general reminder.
Yes, I was just providing information. >>>> Is that the same as 'git rebase origin mesa_7_0_branch' because that >>>> (the later) worked. >>> No, see below. >>> >>>> Somewhere along the line I accidentally merge master into my >>>> mesa_7_0_branch branch. >>> Right above, possibly, that rebased your mesa_7_0_branch onto your >>> origin branch (which I recommend deleting with a 1.5 style repository >>> such as yours). >>> >>>> How do I undo that? >>> After fixing your origin/mesa_7_0_branch, and assuming you don't have >>> any commits on your mesa_7_0_branch that you don't want to lose: >>> git-reset --hard origin/mesa_7_0_branch . >> I guess I need things spelled out. How do I fix my origin/mesa_7_0_branch? >> >> I tried 'git-fetch -f origin/mesa_7_0_branch mesa_7_0_branch' and >> 'git-fetch -f origin/mesa_7_0_branch:mesa_7_0_branch' but they both said >> "Cannot get the repository state from origin/mesa_7_0_branch" > > Does just git-fetch -f work? Yes, it seems to. >> I also tried 'git-reset --hard origin/mesa_7_0_branch .' but it says >> "Cannot do partial --hard reset." > > I suspect it interprets the dot as a path restricting the reset. 'git-reset --hard origin/mesa_7_0_branch' seemed undo the accidental merge. I'll try redoing my changes next... > One thing that can certainly be said against GIT is that its UI isn't > exactly intuitive (although getting better). So if one doesn't know what > a certain invocation will do, it may not be a good idea in general to > just try it. IME it's better to try and understand what it'll do from > documentation or examples first. Agreed, but even after reading the docs (I really do :) ) I'm often not confident I'm doing things correctly. -Brian ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
