chiark
/
gitweb
/
~ian
/
topgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3c01cd2
)
update merging new upstream
author
martin f. krafft
<madduck@madduck.net>
Fri, 26 Sep 2008 18:01:27 +0000
(20:01 +0200)
committer
martin f. krafft
<madduck@madduck.net>
Fri, 26 Sep 2008 18:01:27 +0000
(20:01 +0200)
debian/README.source
patch
|
blob
|
history
diff --git
a/debian/README.source
b/debian/README.source
index c94349804edd65124d75e9a1cc325df6ef8adadf..56556aad3ba97593f4af072d634497204d021aca 100644
(file)
--- a/
debian/README.source
+++ b/
debian/README.source
@@
-79,14
+79,13
@@
TopGit.
5. Importing a new upstream version
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
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:
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.
Now proceed as in the next step.