Re: New branch for No Gnus

[Steinar Bang <sb@dod.no>]

>>>>> Andreas Schwab <schwab@linux-m68k.org>:
> Lars Ingebrigtsen <larsi@gnus.org> writes:
>> As usual, I have no idea how to actually do something like that with
>> git, so could someone give a recipe?  :-)

> $ git branch no-gnus
> $ git push origin no-gnus

I usually do
 git checkout -b no-gnus
 git push origin HEAD
(after this you are on the no-gnus branch, and it is a copy of master
 up to the point when you did the checkout)

Another command to know, is
 git branch

This command will list all local branches, with the one you're currently
on, marked with a "*".


To work on master and get the latest updates, do
 git checkout master
 git pull
(now you can work, and when finished, do)
 git push origin HEAD

To get the latest from master into the no-gnus branch:
 git checkout no-gnus
 git fetch
 git merge origin/master
(and if there are no conflicts, do)
 git push origin HEAD

Note: The big thing about to learn about git isn't that it is a
distributed VCS.  The big thing to learn in git, is branching and
merging.  If you are thinking about branching and merging in the mindset
of CVS or SVN, you have the wrong mental view of things.  Branching and
merging are _cheap_ operations in git

Chapter 3, of the "Pro Git" book, is recommended reading:
 http://progit.org/book/ch3-0.html

The whys and hows of git's behaviour became much clearer to me after
reading that chapter.