From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Shawn O. Pearce" Subject: Re: Commit cherry-picking Date: Tue, 3 Apr 2007 01:33:44 -0400 Message-ID: <20070403053344.GG15922@spearce.org> References: <20070403034234.GB24722@gmail.com> <20070403051947.GE15922@spearce.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org To: Alberto Bertogli X-From: git-owner@vger.kernel.org Tue Apr 03 07:33:52 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1HYbeQ-0006f0-UT for gcvg-git@gmane.org; Tue, 03 Apr 2007 07:33:51 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752826AbXDCFds (ORCPT ); Tue, 3 Apr 2007 01:33:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752851AbXDCFds (ORCPT ); Tue, 3 Apr 2007 01:33:48 -0400 Received: from corvette.plexpod.net ([64.38.20.226]:51704 "EHLO corvette.plexpod.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752826AbXDCFdr (ORCPT ); Tue, 3 Apr 2007 01:33:47 -0400 Received: from cpe-74-70-48-173.nycap.res.rr.com ([74.70.48.173] helo=asimov.home.spearce.org) by corvette.plexpod.net with esmtpa (Exim 4.63) (envelope-from ) id 1HYbeL-0006ni-Km; Tue, 03 Apr 2007 01:33:45 -0400 Received: by asimov.home.spearce.org (Postfix, from userid 1000) id 7DBC420FBAE; Tue, 3 Apr 2007 01:33:44 -0400 (EDT) Content-Disposition: inline In-Reply-To: <20070403051947.GE15922@spearce.org> User-Agent: Mutt/1.5.11 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - corvette.plexpod.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - spearce.org X-Source: X-Source-Args: X-Source-Dir: Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: "Shawn O. Pearce" wrote: > Alberto Bertogli wrote: > > I often use darcs, and one feature I miss when I use git is the ability > > to do cherry-picking on what I'm about to commit. > > Have you tried: > > git add -i > git commit > > ? > > The `git add -i` flag starts up an interactive tool that you can use > to add patch hunks to the index, staging them for the next commit. > Running commit with no arguments will then commit exactly what is > in the index, leaving the other hunks beind in the working directory. Also `git gui` (or `git citool`) offers this hunk selection feature, but in a Tcl/Tk based GUI format. The hunk selection isn't as powerful as I'd like it to be, but it works well enough that I haven't bothered to improve upon it. > Or did I miss something? Note that `git add -i` was added as a > new feature in Git 1.5.0 (and later). git-gui also shipped in 1.5.0... -- Shawn.