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 (file)
index 0000000..efab647
--- /dev/null
+++ b/02-rebase-patches.txt
@@ -0,0 +1,5 @@
+$ git checkout upstream+patches
+$ git rebase upstream
+
+/* deal with conflicts */
+