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 18:48:01 -0400
From:	Jack Howarth <howarth@...mo.msbb.uc.edu>
To:	Daniel Barkalow <barkalow@...ervon.org>
Cc:	linux-kernel@...r.kernel.org
Subject: Re: merging branches remotely with git?

Daniel,
   If I execute...

git clone git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/my-wireless-testing.git
cd my-wireless-testing
git pull git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

I get the error...

You asked me to pull without telling me which branch you
want to merge with, and 'branch.master.merge' in
your configuration file does not tell me either.  Please
name which branch you want to merge on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details on the refspec.

If you often merge with the same branch, you may want to
configure the following variables in your configuration
file:

    branch.master.remote = <nickname>
    branch.master.merge = <remote-ref>
    remote.<nickname>.url = <url>
    remote.<nickname>.fetch = <refspec>

See git-config(1) for details.

All I want to do is merge the latest linus-kernel git into the
my-wireless-testing git so that I can have both the ath9k drivers
and the alsa 1.0.17 drivers. What do I need to do to eliminate the
above error? 
             Jack
ps Which git represents the git patches (like 2.6.26-git11) which are
placed as patches on the www.kernel.org web page under the section
The latest snapshot for the stable Linux kernel tree is:.

On Thu, Jul 24, 2008 at 03:09:18PM -0400, Daniel Barkalow wrote:
> 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/