From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Boyd Stephen Smith Jr." Subject: Re: collapsing commits with rebase Date: Wed, 7 Jan 2009 20:39:07 -0600 Message-ID: <200901072039.12631.bss@iguanasuicide.net> References: <93c3eada0901071608r190a723bma502b68c4ab81a08@mail.gmail.com> <200901072011.37299.bss@iguanasuicide.net> <20090108023224.GU21154@genesis.frugalware.org> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart23253997.HAyAqSh4C7"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Cc: geoffrey.russell@gmail.com, git@vger.kernel.org To: Miklos Vajna X-From: git-owner@vger.kernel.org Thu Jan 08 03:40:10 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1LKkoY-0001bo-Ac for gcvg-git-2@gmane.org; Thu, 08 Jan 2009 03:40:06 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751334AbZAHCin (ORCPT ); Wed, 7 Jan 2009 21:38:43 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751281AbZAHCin (ORCPT ); Wed, 7 Jan 2009 21:38:43 -0500 Received: from rei.iguanasuicide.net ([209.20.91.252]:54728 "EHLO rei.iguanasuicide.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750738AbZAHCim (ORCPT ); Wed, 7 Jan 2009 21:38:42 -0500 Received: from ip72-204-50-125.fv.ks.cox.net ([72.204.50.125] helo=[10.0.0.124]) by rei.iguanasuicide.net with esmtpsa (TLS-1.0:DHE_DSS_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1LKknA-0006wT-Eq; Thu, 08 Jan 2009 02:38:40 +0000 User-Agent: KMail/1.9.10 In-Reply-To: <20090108023224.GU21154@genesis.frugalware.org> X-Eric-Conspiracy: There is no conspiracy. X-Virus-Scanned: clamav@iguanasuicide.net Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: --nextPart23253997.HAyAqSh4C7 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Wednesday 2009 January 07 20:32:24 Miklos Vajna wrote: >On Wed, Jan 07, 2009 at 08:11:32PM -0600, "Boyd Stephen Smith Jr."=20 wrote: >> git merge -s sha(D) > >You probably mean --squash here, -s stands for --strategy - and I *hope* >you don't have git-sha(D) in your PATH, as a custom merge strategy. ;-) Oops. Yes. My mistake. =2D-=20 Boyd Stephen Smith Jr. ,=3D ,-_-. =3D.=20 bss@iguanasuicide.net ((_/)o o(\_)) ICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-'=20 http://iguanasuicide.net/ \_/ =20 --nextPart23253997.HAyAqSh4C7 Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) iEYEABECAAYFAkllZ1AACgkQdNbfk+86fC2EcgCeJvHm4r7fogt78cb8dw4L/KM2 M0sAn39WmrBlZbpn17GYtyP5+7XX1+6u =8vHk -----END PGP SIGNATURE----- --nextPart23253997.HAyAqSh4C7--