server-1.2-branch accidentally merged with master

[Daniel Stone]

On Tue, Oct 10, 2006 at 09:15:48AM +0200, Michel Dänzer wrote:
> On Mon, 2006-10-09 at 17:40 -0700, Alan Coopersmith wrote:
> > In attempting to checkin a simple configure.ac script fix to the
> > server-1.2-branch today, I appear to have accidentally merged
> > master into the server-1.2-branch.   Is there any way to undo this?
> 
> I guess we could just revert broken commits this time.

That's your only option, else your old branch head won't fast forward to
the new one?

>       * Always double-checking with gitk (or at least something like
>         git-log) that things look sane before pushing anything.

Yep.  git-log origin..master should generally DTRT, or git diff
origin..master | diffstat.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg/attachments/20061010/7fbe2607/attachment.pgp>