Hi guys, I just updated git to 1.5.0.5 in opt. Here's how things work with this release: First, clone the repository as usual: $ git clone git://as.usual/blah.git Next, tell git what email address to use (optional). You might have to set your name, too (this didn't change with 1.5) $ git repo-config user.email me@crux.nu Now we need to grab the branches that we want to work on, e.g. the 2.2 and 2.3 branches: $ git branch 2.2 origin/2.2 $ git branch 2.3 origin/2.3 And check it out as usual $ git checkout 2.2 Let's update the wine port $ vim wine/* We need to add all the changed files to the changeset: $ git add wine/{Pkgfile,.footprint,.md5sum} $ git commit -m "wine: updated to ..." Update the 2.3 branch as well: $ git checkout 2.3 $ git pull . 2.2 Publish our changes: $ git push If you prefer, you can update tomorrow around meeting time and I'll do some hand-holding ;) Regards, Tilman -- A: Because it messes up the order in which people normally read text. Q: Why is top-posting such a bad thing? A: Top-posting. Q: What is the most annoying thing on usenet and in e-mail?
Tilman Sauerbeck [2007-03-19 08:33]:
[snip]
Publish our changes: $ git push
5 days have passed, and you want to update your local repository. Like this. Grab the latest bits: $ git fetch And update your 2.3 branch: $ git checkout 2.3 $ git rebase origin/2.3 Ditto for other branches. Regards, Tilman -- A: Because it messes up the order in which people normally read text. Q: Why is top-posting such a bad thing? A: Top-posting. Q: What is the most annoying thing on usenet and in e-mail?
participants (1)
-
Tilman Sauerbeck