From 8f641b34e1d240b384d800b4350589166a4ce6b0 Mon Sep 17 00:00:00 2001
From: Pierre Habouzit <madcoder@debian.org>
Date: Fri, 22 Feb 2008 18:54:48 +0100
Subject: [PATCH] more txts

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---
 02-rebase-patches.txt | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 02-rebase-patches.txt

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 */
+
-- 
2.20.1