X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=debian%2FREADME.source;h=56556aad3ba97593f4af072d634497204d021aca;hp=c94349804edd65124d75e9a1cc325df6ef8adadf;hb=5f4b1948420011b74d8b8d9c96c63d0b04f242cd;hpb=3c01cd2fe990d94651758ca858dd6ee326e73f7b diff --git a/debian/README.source b/debian/README.source index c943498..56556aa 100644 --- a/debian/README.source +++ b/debian/README.source @@ -79,14 +79,13 @@ TopGit. 5. Importing a new upstream version ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -To import a new upstream, pull it into the upstream branch, merge upstream +To import a new upstream, update the remote, merge the tag you want to merge into the master branch, ideally together with an update to debian/changelog, then update all TopGit branches: -1. git checkout upstream -2. git pull -3. git checkout master -4. git merge upstream +1. git remote update +2. git checkout master +3. git merge topgit-0.4 Now proceed as in the next step.