linux-kernel - Re: merging branches remotely with git?

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 24 Jul 2008 15:09:18 -0400 (EDT)
From:	Daniel Barkalow <barkalow@...ervon.org>
To:	Jack Howarth <howarth@...mo.msbb.uc.edu>
cc:	linux-kernel@...r.kernel.org
Subject: Re: merging branches remotely with git?

On Thu, 24 Jul 2008, Jack Howarth wrote:

>     I am trying to do a local merge of the linus-kernel git and
> the my-wireless-testing git. Is this possible? I have cloned both
> locally with...
> 
> git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
> git clone git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/my-wireless-testing.git
> 
> I thought from the git documentation that I was supposed to be able to
> create a merge automatically with...
> 
> git merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/my-wireless-testing.git
>
> however this reports...
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git - not something we can merge
> 
> Any advice on how this can be done would be appreciated.

In the my-wireless-testing directory:

git pull git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

or:

git pull ../linux-2.6.git (which gets it from the other clone you made).

"git merge" is for merging branches you have (copies of) in the same 
repository. There's also "git fetch" for getting local copies of branches 
(and tags) elsewhere, and "git pull" does a "fetch" and a "merge", with 
the ability to put the information only in a temporary location in 
between.

What part of the documentation confused you? It probably needs to be 
clarified.

	-Daniel
*This .sig left intentionally blank*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/