Comments on: Git Beyond the D in DVCS http://lostechies.com/keithdahlby/2011/10/14/git-beyond-the-d-in-dvcs/ Git, .NET and more Mon, 01 Apr 2013 17:24:00 +0000 hourly 1 http://wordpress.org/?v=3.4.2 By: Keith Dahlby http://lostechies.com/keithdahlby/2011/10/14/git-beyond-the-d-in-dvcs/#comment-103 Keith Dahlby Sat, 15 Oct 2011 02:31:00 +0000 http://lostechies.com/keithdahlby/?p=83#comment-103 There's really not much of a workflow to it. When you get to a point where you find yourself with overlapping logical changes in a file you can use <code>git add -p</code> to stage and commit those changes in multiple parts. The easiest way to see this in action is to make several changes then do a <code>git add -Ap</code> to stage all files, piece by piece. For each hunk of changes you'll be presented with several options: the most important are y/n (do or do not include the current hunk) and s (split this hunk into smaller hunks). Once you've staged something, try a <code>git reset -p</code> to go in the other direction. There’s really not much of a workflow to it. When you get to a point where you find yourself with overlapping logical changes in a file you can use git add -p to stage and commit those changes in multiple parts.

The easiest way to see this in action is to make several changes then do a git add -Ap to stage all files, piece by piece. For each hunk of changes you’ll be presented with several options: the most important are y/n (do or do not include the current hunk) and s (split this hunk into smaller hunks). Once you’ve staged something, try a git reset -p to go in the other direction.

]]> By: Domenic Denicola http://lostechies.com/keithdahlby/2011/10/14/git-beyond-the-d-in-dvcs/#comment-102 Domenic Denicola Fri, 14 Oct 2011 13:37:00 +0000 http://lostechies.com/keithdahlby/?p=83#comment-102 > I use this feature on an almost daily basis to separate cosmetic changes from refactoring from new feature work, without having to undo some changes so that I can commit the others. Can you expand on this? I've often wanted some way to do this kind of thing, but cannot figure out from your brief description what the workflow would be. Thanks for the great post! > I use this feature on an almost daily basis to separate cosmetic changes
from refactoring from new feature work, without having to undo some
changes so that I can commit the others.

Can you expand on this? I’ve often wanted some way to do this kind of thing, but cannot figure out from your brief description what the workflow would be.

Thanks for the great post!

]]> By: Jason Meridth http://lostechies.com/keithdahlby/2011/10/14/git-beyond-the-d-in-dvcs/#comment-101 Jason Meridth Fri, 14 Oct 2011 13:13:00 +0000 http://lostechies.com/keithdahlby/?p=83#comment-101 Excellent post.  There are a few tricks in there I have never used.  Thank you for sharing them Keith. Excellent post.  There are a few tricks in there I have never used.  Thank you for sharing them Keith.

]]> By: The Morning Brew - Chris Alcock » The Morning Brew #959 http://lostechies.com/keithdahlby/2011/10/14/git-beyond-the-d-in-dvcs/#comment-100 The Morning Brew - Chris Alcock » The Morning Brew #959 Fri, 14 Oct 2011 07:37:05 +0000 http://lostechies.com/keithdahlby/?p=83#comment-100 [...] Git Beyond the D in DVCS - Keith Dahlby joins in the discussion highlighting some of the key features of the Git DVCS and how he uses them. [...] [...] Git Beyond the D in DVCS – Keith Dahlby joins in the discussion highlighting some of the key features of the Git DVCS and how he uses them. [...]

]]>