Conrad Parker wrote:
> On 11/04/2008, Erik de Castro Lopo <[EMAIL PROTECTED]> wrote:
> > d) Routinely update my upstream source branch (this I can do with
> > "git fetch ; git rebase origin" but I'm not entirely sure what
> > these commands do).
>
> Perhaps this helps (it's a bit clearer than the man page):
>
> http://jbowes.dangerouslyinc.com/2007/01/26/git-rebase-keeping-your-branches-current/
Ok, that explains what 'git rebase' does and is much appreciated.
The problem unfortunately is that this is very much an advocacy
article rather than a tutorial.
I have found this, titled "Learn Git in an Hour with PeepCode's
Git Screencast":
http://www.linuxworld.com/news/2008/040208-git-screencast.html
and quoting from the article:
"Next, the screencast dives into a detailed example of branching.
Grosenbach uses the gitk visualization tool to demonstrate and
show a graphic view of branching actions, such as: creating
branches, switching between branches, merging, resolving conflicts,
and using rebase."
which seems to be what I'm after, but at the end of the article it
says:
"PeepCode's Git Screencast costs US$9.00, is 60 minutes long,
and can be downloaded from ...."
This makes me wonder, how fscked up does a DVCS have to be that you
need tens of megabytes of video to show how it works when Bzr and many
others can do it with less than ten kilobytes of html text?
Erik
--
-----------------------------------------------------------------
Erik de Castro Lopo
-----------------------------------------------------------------
"C++ has its place in the history of programming languages. Just
as Caligula has his place in the history of the Roman Empire."
-- Robert Firth
_______________________________________________
coders mailing list
[email protected]
http://lists.slug.org.au/listinfo/coders
