Re: git patch

[John Mandereau]

Johannes Schindelin wrote:

> On Tue, 5 Dec 2006, John Mandereau wrote:
> 
> > I can easily do all common operations (including push), except that I 
> > don't know what should be the best way to merge branches in order to 
> > push them to git.sv.gnu.org (but Erik will certainly tell us in his 
> > tutorial ;-)
> 
> Suppose you have set up a shortcut for git.sv.gnu.org like this (in the 
> lilypond working directory):
> 
> $ git repo-config remote.gnu.url git://git.sv.gnu.org/lilypond.git
> 
> you can merge the master easily with
> 
> $ git pull gnu master
> 
> which means that you pull (=fetch & merge) the branch "master" from the 
> remote "gnu".

Thanks!
I usually use "cg-branch-{ls,add,chg}" to manage remote branches and "cg
update <remote branch>" to pull, and I'm happy with that.


> BTW what were the most difficult things for you to learn about git, and 
> what things would you like to have explained?

git is much more complex and powerful than cvs, so it takes time to
understand all git concepts. I haven't read all git documentation, I
just wanted to get quickly started, so I don't want to complain :-)


The only thing I'd like to have explained is the best way of merging
remote branches, for example on LilyPond git repository. I don't think
I'll need to do that, though (that's rather the developers' work, but
I'm just curious about it).

Cheers,
-- 
John Mandereau <address@hidden>