From e1e69609a10733a80c7d70810cc83f2c34026d02 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Wed, 4 Feb 2009 01:38:19 -0500 Subject: [PATCH 1/1] update README.SIPB some --- README.SIPB | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/README.SIPB b/README.SIPB index 99882da7c..c88f19387 100644 --- 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 -- 2.45.2