summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Paulo Rechi Vita <jprvita@openbossa.org>2012-03-01 11:41:04 -0300
committerJoão Paulo Rechi Vita <jprvita@openbossa.org>2012-03-01 11:48:13 -0300
commit825c36f97ef52121285ba0c44f621fa8b7ec643b (patch)
treee5388ef80750e553e2711f33fe2e2c6a30c0c220
parent4d9aa23bcefc79e4de41e4e3210ce6b89a26654c (diff)
downloadbluez-le-docs-825c36f97ef52121285ba0c44f621fa8b7ec643b.tar.gz
bluez-le-docs-825c36f97ef52121285ba0c44f621fa8b7ec643b.tar.xz
bluez-le-docs-825c36f97ef52121285ba0c44f621fa8b7ec643b.zip
howto: add intructions on how to update the linux source
-rw-r--r--howto.tex11
1 files changed, 11 insertions, 0 deletions
diff --git a/howto.tex b/howto.tex
index f03b802..ac70a21 100644
--- a/howto.tex
+++ b/howto.tex
@@ -92,6 +92,17 @@ Additionally, one should take special care when doing changes on top of this
branch, since it's going to be constantly rebased on top of the {\em
bluetooth-next} kernel tree.
+To update the local branch with the latest version of the remote {\em
+integration} branch (make sure you're on the {\em linux} directory and {\em
+integration} branch):
+
+\begin{verbose}
+$ git fetch origin
+$ git reset --hard origin/integration
+\end{verbose}
+
+Note that all local changes to tracked files will be lost.
+
\subsection{Userspace}