Skip to contentSkip to conversation

XFS "master" branch re-based

DISCUSSION Alex Elder 1 participant 1 message Oct 12, 2011

lore
Share & tools
lore

Alex Elder

author
#0 lore 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
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs