projects
/
~madcoder
/
fosdem.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
812b1e9
)
more txts
author
Pierre Habouzit
<madcoder@debian.org>
Fri, 22 Feb 2008 17:54:48 +0000
(18:54 +0100)
committer
Pierre Habouzit
<madcoder@debian.org>
Fri, 22 Feb 2008 17:54:48 +0000
(18:54 +0100)
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
02-rebase-patches.txt
[new file with mode: 0644]
patch
|
blob
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 */
+