The following commit has been merged in the README branch:
commit a50e3c3406381a13cb2dc94313c46f1d88cebe86
Author: Samuel Thibault <[email protected]>
Date: Sun Feb 19 05:39:02 2012 +0100
Add dde branch
diff --git a/README b/README
index e98350c..11bd4b1 100644
--- a/README
+++ b/README
@@ -2,6 +2,9 @@ In order to merge the upstream libpthread and procfs into the
hurd sources, the
files have to be moved to subdirectories. This is what '*-moved' branches are
for, i.e. the merge process is:
+$ git checkout dde
+$ git pull upstream-dde
+$ git tag -a upstream/dde/<date>
$ git checkout libpthread
$ git pull upstream-libpthread
$ git tag -a upstream/libpthread/<date>
@@ -24,6 +27,7 @@ $ git pull upstream
$ git tag -a upstream/hurd/<date>
$ git checkout upstream-merged
$ git pull . upstream
+$ git pull . dde
$ git pull . libpthread-moved
$ git pull . random
$ git pull . procfs-jkoenig-moved
--
Debian GNU Hurd packaging