linux-kernel - Re: GIT question - am I doing it correctly?

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] [day] [month] [year] [list]

Message-ID: <20110107091911.GB1891@tiehlicka.suse.cz>
Date:	Fri, 7 Jan 2011 10:19:12 +0100
From:	Michal Hocko <mhocko@...e.cz>
To:	Piotr Hosowicz <piotr@...owicz.com>
Cc:	LKML <linux-kernel@...r.kernel.org>
Subject: Re: GIT question - am I doing it correctly?

On Thu 06-01-11 18:04:17, Piotr Hosowicz wrote:
> On 03.01.2011 14:48, Michal Hocko wrote:
> >On Wed 29-12-10 17:23:02, Piotr Hosowicz wrote:
> >>Hello,
> >
> >Hi,
> >
> >>
> >>Everytime I git pull tyhe Linus' sources but before I build I apply
> >>Peter Zijlstra's fixes, Takashi Iwai's sources and Dave Miller's
> >>sources. The sequence is:
> >>
> >># the Linus' sources
> >>git pull
> >>
> >># external sources
> >>git remote add some_name git://some_URL.git
> >>
> >># update
> >>git remote update
> >>
> >>Then configure and I build. I noticed that especially Peter's
> >>git-update very quickly, not as long as they did before.
> >>
> >>Is my procedure correct? I am new to GIT.
> >
> >What do you want to achieve?
> 
> I would like to have everything from Linus tree + additions from
> mmotm for example.

Andrew maintains mmotm as a quilt tree AFAIK, though there is some
initiative to have also a git tree which mirrors it
(http://lwn.net/Articles/311677/).  Btw. mmotm contains Linus tree (from
certain point of time).

Anyway, you can add what-ever git tree as a new remote. This basically
means that you can fetch commits from that tree into your local git
"database" and checkout out any of them as a branch (please note that if
the remote shares commits with your trees then you commit just the
additional ones). 

If you add a remote it doesn't mean that you stack that tree on top of
the original one. It is all just about commits which have their parents
so they form a history (very roughtly). You will find more about remotes
here: http://progit.org/book/ch2-5.html.

> Regards,
> 
> Piotr Hosowicz
> 
> -- 
> Z cyklu "Uroki demokracji", czyli pytania i odpowiedzi w teledurniejach:
> - Jak d?ugo trwa?a wojna sze?ciodniowa mi?dzy Izraelem a Egiptem?
> - (po d?u?szym namy?le): Czterna?cie dni.
> NP: Peter Green Splinter Group - Big Change Is Gonna Come
> NB: 2.6.37

-- 
Michal Hocko
L3 team 
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9    
Czech Republic
--
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/