public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Ben Myers <bpm@sgi.com>
To: xfs@oss.sgi.com
Subject: git://oss.sgi.com/xfs/xfs master branch rebase
Date: Mon, 14 May 2012 16:55:11 -0500	[thread overview]
Message-ID: <20120514215511.GF16099@sgi.com> (raw)

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

                 reply	other threads:[~2012-05-14 21:50 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120514215511.GF16099@sgi.com \
    --to=bpm@sgi.com \
    --cc=xfs@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox