Set Content-Style-Type.

[ikiwiki.git] / README.SIPB

diff --git a/README.SIPB b/README.SIPB
index 99882da7cf2738a2499f97ee3b4fed81de97d1e2..c88f1938712c5d8012dd5dca92994a6386b5cf26 100644 (file)
--- a/README.SIPB
+++ b/README.SIPB
@@ -23,20 +23,15 @@ of rearchitecting and upstream cooperation.
 
 Keeping up to date:
 
-    XXX: This shouldn't be done anymore, as we now have a bare repository.
-    New instructions for syncing should be upcoming.
+XXX: This is what we'd do in our original clone of upstream.
+  How do we do this now that we have our own internal repo to clone?
 
 This two-tiered setup means that you will need to rebase twice in order
 to propagate changes; possibly once if master == origin/master. Your
 commands will look like this:
 
-$ git checkout origin
-if master == remotes/origin/master:
-  $ git pull
-else
-  $ git fetch
-  $ git rebase origin/master
-fi
+$ git checkout master
+$ git pull --rebase
 $ git checkout sipb
 $ git rebase master