From: Linus Torvalds <torvalds@osdl.org>
Date: Mon, 31 Oct 2005 23:42:33 GMT
Subject: Re: Question on GIT usage.
Message-ID: <Pine.LNX.4.64.0510311540300.27915@g5.osdl.org>
In-Reply-To: <Pine.LNX.4.64.0510311821410.25300@iabervon.org>



On Mon, 31 Oct 2005, Daniel Barkalow wrote:
> 
> Oh, that reminds me: is there a simple way to merge a branch with another 
> local branch or remote branch that's already up-to-date? E.g., I've 
> already fetched the latest git from kernel.org, built it, and installed 
> it. Now I want to merge my development branch with that. Last time I was 
> looking, I had to write the message for the merge myself, unlike "pull", 
> which takes care of that.

Umm.. Why don't you just use "pull"?

I _think_ you should be able to just do

	git pull <repodir> <branchname>

where <repodir> can even be just "." for the very same repository.

I've not tested it, but dammit, it should work. If it doesn't, it's a bug.

		Linus