From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by nuthatch.gentoo.org with esmtp (Exim 4.54) id 1FZpBs-00049G-Pi for garchives@archives.gentoo.org; Sat, 29 Apr 2006 13:08:53 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.13.6/8.13.6) with SMTP id k3TD8JhB027995; Sat, 29 Apr 2006 13:08:19 GMT Received: from smtp.ferdyx.org (170.Red-213-96-222.staticIP.rima-tde.net [213.96.222.170]) by robin.gentoo.org (8.13.6/8.13.6) with ESMTP id k3TD69df005315 for ; Sat, 29 Apr 2006 13:06:09 GMT Received: from localhost (localhost [127.0.0.1]) by smtp.ferdyx.org (Postfix) with ESMTP id C83D48D38E for ; Sat, 29 Apr 2006 15:04:42 +0200 (CEST) Received: from smtp.ferdyx.org ([127.0.0.1]) by localhost (tungsteno [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 08686-07 for ; Sat, 29 Apr 2006 15:04:40 +0200 (CEST) Received: from posidon.ferdyx.org (posidon.ferdyx.org [192.168.0.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.ferdyx.org (Postfix) with ESMTP id 7FD068D34F for ; Sat, 29 Apr 2006 15:04:39 +0200 (CEST) Received: by posidon.ferdyx.org (nbSMTP-1.01-cvs) for uid 1000 (using TLSv1/SSLv3 with cipher DHE-RSA-AES256-SHA (256/256 bits)) ferdy@gentoo.org; Sat, 29 Apr 2006 15:06:05 +0200 (CEST) Date: Sat, 29 Apr 2006 15:06:05 +0200 From: "Fernando J. Pereda" To: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] Gentoo: State of the Union Message-ID: <20060429130605.GB13685@ferdyx.org> Mail-Followup-To: gentoo-dev@lists.gentoo.org References: <20060428171453.GB62035@watcher.kimaker.com> <200604291502.47183.danarmak@gentoo.org> <20060429122147.GA13685@ferdyx.org> <200604291554.17381.danarmak@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@gentoo.org Reply-to: gentoo-dev@lists.gentoo.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="bCsyhTFzCvuiizWE" Content-Disposition: inline In-Reply-To: <200604291554.17381.danarmak@gentoo.org> User-Agent: Mutt/1.5.11 X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at ferdyx.org X-Archives-Salt: 4192bee1-a055-43e2-b0e5-3b0c4da30147 X-Archives-Hash: 5c406e3d6b67866134cabd07436c23d8 --bCsyhTFzCvuiizWE Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Apr 29, 2006 at 03:54:17PM +0300, Dan Armak wrote: > On Saturday 29 April 2006 15:21, Fernando J. Pereda wrote: > > The commit marked with @ is a special comit called a 'merge'. > > I hope that clarifies the merge tracking part. > You just described what merging is. Svn can do that too with svn merge. B= ut,=20 > if I merge changesets from branch A to B selectively, skipping some along= the=20 > way, can I later ask git to: >=20 > - list the changesets remaining in A that I haven't merged to B yet?=20 Yes, unless you used cherry-pick. You have to do *real* merges to be able to do that. > - list the branches, from a given list, which have/haven't merged a given= =20 > changeset? It depends on how you merged the changesets, if you did it sanely, yes, should be easy. If you used cherry-pick here and there I don't think so. > I didn't mean that 'changeset tracking' is different from 'merge tracking= '. Ok. - ferdy --=20 Fernando J. Pereda Garcimart=EDn Gentoo Developer (Alpha,net-mail,mutt,git) 20BB BDC3 761A 4781 E6ED ED0B 0A48 5B0C 60BD 28D4 --bCsyhTFzCvuiizWE Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) iD8DBQFEU2S9CkhbDGC9KNQRAl9AAJ9W8J5lVKJnvInLY8/5js/xsobxbwCdHUEY 3pWNKhZIFMgykFxcWZFkVNM= =eA66 -----END PGP SIGNATURE----- --bCsyhTFzCvuiizWE-- -- gentoo-dev@gentoo.org mailing list