From: Pierre Habouzit <madcoder@debian.org>
Date: Fri, 22 Feb 2008 17:54:48 +0000 (+0100)
Subject: more txts
X-Git-Url: http://git.madism.org/?p=~madcoder%2Ffosdem.git;a=commitdiff_plain;h=8f641b34e1d240b384d800b4350589166a4ce6b0

more txts

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---

diff --git a/02-rebase-patches.txt b/02-rebase-patches.txt
new file mode 100644
index 0000000..efab647
--- /dev/null
+++ b/02-rebase-patches.txt
@@ -0,0 +1,5 @@
+$ git checkout upstream+patches
+$ git rebase upstream
+
+/* deal with conflicts */
+