* git://oss.sgi.com/xfs/xfs master branch rebase
@ 2012-05-14 21:55 Ben Myers
0 siblings, 0 replies; only message in thread
From: Ben Myers @ 2012-05-14 21:55 UTC (permalink / raw)
To: xfs
Hi Folks,
Apparently there was a PEBKAC in my office on April 18. I pulled in a patch
twice (on separate hosts) and then didn't notice the merge commit when I
combined them.
Rather than pollute the upstream tree with this garbage I have chosen to
rebase the master branch at git://oss.sgi.com/xfs/xfs. You'll notice that
now it doesn't contain 64a97f1 and 576f1a5. Other than that it is the same
as before.
The old branch can still be found here:
http://oss.sgi.com/cgi-bin/gitweb.cgi?p=xfs/xfs.git;a=shortlog;h=refs/heads/master-for-3.5-bad
I'll keep this 'bad' branch around for awhile for reference.
Anyone working on xfs atop the old master branch will need to rebase his or
her changes onto the new one. I apologise for any inconvenience.
Regards,
Ben
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-05-14 21:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-14 21:55 git://oss.sgi.com/xfs/xfs master branch rebase Ben Myers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox