Thanks Ben/Jarno, I had previously seen some people using git add/commit -p but found it not very intuitive. I had also used the Git GUI at some time but never realized that is offers the possibility to stage individual hunks or even lines in a file. That looks pretty neat.
Regards, Jan > -----Original Message----- > From: Ben Pfaff [mailto:[email protected]] > > On Wed, Dec 21, 2016 at 10:06:29AM -0800, Jarno Rajahalme wrote: > > > > > On Dec 21, 2016, at 9:30 AM, Ben Pfaff <[email protected]> wrote: > > > > > > There was a question about splitting up large commits in Git. I do > > > this routinely and I volunteered to find some resources. > > > > > > The "git-rebase" manpage has a section titled "SPLITTING COMMITS" > > > that is a good place to start. It does not cover very well how to > > > commit parts of a file rather than a whole file, which is something > > > that I do often. For this, I use "git citool" and then select lines > > > to commit and right-click to "stage lines for commit". I know that > > > there's a mode for the "git commit" CLI that can do this too, but > > > I've always found that hard to use compared to "git citool”. > > > > You mean “git add -p”? I’ve used that, but was not aware of “git > > citool”… > > I think I use "git rebase -i" and "git citool" more than any other git > commands. (I use "git am" a lot too but I have a mutt shortcut for > that.) _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
