[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    Re: Question on GIT usage.
From:       Daniel Barkalow <barkalow () iabervon ! org>
Date:       2005-10-31 23:56:43
Message-ID: Pine.LNX.4.64.0510311847570.25300 () iabervon ! org
[Download RAW message or body]

On Mon, 31 Oct 2005, Linus Torvalds wrote:

> 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.

That does follow logically, but it really ought to be an example in the 
documentation, because "fetch what you have from yourself and merge it" 
isn't the first thing that comes to mind for me. :)

I'll make sure that works and comes out nicely, and then send in a 
Documentation patch.

	-Daniel
*This .sig left intentionally blank*
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]