Skip to content
Browse files

Updated the README

  • Loading branch information...
1 parent 15b5cd9 commit c8948338e7a29a1126be0aae0f6e5a2c1ebe5532 @gdamjan committed May 13, 2012
Showing with 5 additions and 5 deletions.
  1. +5 −5 README.rst
View
10 README.rst
@@ -7,23 +7,22 @@ This repo is a fork of the stable linux kernel with two additional features patc
* tuxonice_ for better (faster, more robust, fancier) hibernation to disk
* `TP Smapi`_ driver for the thinkpad specific firmware (includes an improved hdaps driver and more battery control).
-The master branch is an identical clone of Linus' master development branch and is not patched, you should ignore it. Only stable versions will be patched as they appear. You can see the list of branches in the github `branch list`_.
+This repo has branches for every stable release I track. You can see the list of branches in the github `branch list`_. I usually focus on the newest -stable branch, and older branches might not get timely updates for minor releases (please merge it yourself if you need that).
-git usasge
+git usage
==========
To get the branch directly use::
git clone -b <name of branch> git://github.com/gdamjan/linux.git
-To switch to another branch for the first time use::
+To switch to another `branch_` for the first time use::
git checkout -t origin/<name of branch>
-I ussualy focus on the newest -stable branch, and older branches might not get timely
-updates to minor releases. But you can do it yourself with the following command::
+To merge an older branch from upstream that I've stopped tracking::
git pull git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git \
linux-3.0.y:linux-3.0.y-thinkpad
@@ -37,3 +36,4 @@ My latest kernel config is at https://gist.github.com/1303870 - I own a Thinkpad
.. _tuxonice: http://www.tuxonice.net
.. _TP Smapi: http://www.thinkwiki.org/wiki/Tp_smapi
.. _branch list: https://github.com/gdamjan/linux/branches
+.. _branch: https://github.com/gdamjan/linux/branches

0 comments on commit c894833

Please sign in to comment.
Something went wrong with that request. Please try again.