One more subject for the WIki

Moin

What about this adition to the Wiki? I could also simply add it to the KDE Git
wiki, of course.

Carsten

== Using multiple branches ==

In Git it is very easy to have several branches. Usually, you keep one branch
per feature, so called “Topic Branches”.

Because git tracks merges, output from “git log master…$topic” gives all
you need to know about $topic. The command lists changes that are still
not merged to master on the $topic branch. If the list is empty, $topic is
already merged fully to master.

For more details refer to one of the linked tutorials.

Am Wednesday 21 January 2009 09:12:46 schrieb Carsten Niehaus:

Moin

What about this adition to the Wiki? I could also simply add it to the KDE
Git wiki, of course.

Oh, I forgot to mention that the text is based upon a comment of Junio C
Hamano (Git maintainer) on the Git list. But I doubt that there is a
copyright issue for taking 4 lines of an email.

Carsten


“The idea of abstracting away the one thing that must be blindingly fast,
the kernel, is inherently counter productive.”

– Linus Torvalds on Microkernels (Open Sources, 1999 O’Reilly & Associates)

What about this adition to the Wiki? I could also simply add it to
the KDE Git
wiki, of course.

Sure. We use topic branches sometimes, so I expect it would be used.

Cheers,
-Geoff

Moin

What about this adition to the Wiki? I could also simply add it to
the KDE Git wiki, of course.

Sure. We use topic branches sometimes, so I expect it would be used.

The point is: I am not allowed to change the wiki as I am in the wrong user group. So somebody who is in the right group has to add it for me :slight_smile:

Carsten

NUR NOCH BIS 31.01.! GMX FreeDSL - Telefonanschluss + DSL
für nur 16,37 EURO/mtl.!* http://dsl.gmx.de/?ac=OM.AD.PD003K11308T4569a

Geoffrey Hutchison wrote:

What about this adition to the Wiki? I could also simply add it to
the KDE Git
wiki, of course.

Sure. We use topic branches sometimes, so I expect it would be used.

I have been using topic branches a lot - they are amazing once you start
using them in Git. In SVN it would have been unthinkable and so they
made me nervous at first. It is a very natural way to work, like git
stash on steroids.