From: Shawn O. Pearce Date: Tue, 03 Apr 2007 05:33:44 GMT Subject: Re: Commit cherry-picking Message-ID: <20070403053344.GG15922@spearce.org> In-Reply-To: <20070403051947.GE15922@spearce.org> "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.