public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Alex Elder <aelder@sgi.com>
To: xfs@oss.sgi.com
Subject: XFS "master" branch re-based
Date: Wed, 12 Oct 2011 12:34:10 -0500	[thread overview]
Message-ID: <1318440850.2918.33.camel@doink> (raw)

The XFS master branch on oss.sgi.com has been re-based.
Commits made since the branch was last updated to
Linux v3.1-rc1 have been changed to be based on
Linux v3.1-rc9.

As a result, if you have any local branches tracking
the XFS master branch, a simple "pull" command will
not likely give the result you want.

The following command will forcibly update a local
branch named "xfs-master" to match what's in the
repository on oss.sgi.com.

    git pull -f git://oss.sgi.com/xfs/xfs.git \
        master:xfs-master

Another branch named "master-pre-3.1-rc9-rebase"
has been created in order to preserve the commits
that had been published prior to this rebase.

					-Alex




_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

             reply	other threads:[~2011-10-12 17:34 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-12 17:34 Alex Elder [this message]
  -- strict thread matches above, loose matches on Subject: below --
2010-10-18 21:56 XFS Master Branch Re-based Alex Elder

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=1318440850.2918.33.camel@doink \
    --to=aelder@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