Thread (4 messages) flat view 4 messages, 2 authors, 2016-06-15

Re: Commit cherry-picking

From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:43:02

"Shawn O. Pearce" [off-list ref] wrote:
Alberto Bertogli [off-list ref] wrote:
quoted
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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help