Re: Question about your git habits

From: Jan Engelhardt <jengelh@computergmbh.de>
Date: Feb 23, 2008, 01:37 UTC
Message-ID: <Pine.LNX.4.64.0802230221140.21077@fbirervta.pbzchgretzou.qr>
In-Reply-To: <200802221837.37680.chase.venters@clientec.com>

On Feb 22 2008 18:37, Chase Venters wrote:

Show 7 quoted lines

>
>I've been making myself more familiar with git lately and I'm curious what 
>habits others have adopted. (I know there are a few documents in circulation 
>that deal with using git to work on the kernel but I don't think this has 
>been specifically covered).
>
>My question is: If you're working on multiple things at once,

Impossible; Humans only have one core with only seven registers -- according to CodingStyle chapter 6 paragraph 4.

>do you tend to clone the entire repository repeatedly into a series
>of separate working directories

Too time consuming on consumer drives with projects the size of Linux.

>and do your work there, then pull
>that work (possibly comprising a series of "temporary" commits) back
>into a separate local master respository with --squash, either into
>"master" or into a branch containing the new feature?

No, just commit the current unfinished work to a new branch and deal with it later (cherry-pick, rebase, reset --soft, commit --amend -i, you name it). Or if all else fails, use git-stash.

You do not have to push these temporary branches at all, so it is much nicer than svn. (Once all the work is done and cleanly in master, you can kill off all branches without having a record of their previous existence.)

>Or perhaps you create a temporary topical branch for each thing you
>are working on, and commit arbitrary changes then checkout another
>branch when you need to change gears, finally --squashing the
>intermediate commits when a particular piece of work is done?

if I don't collect arbitrary changes, I don't need squashing (see reset --soft/amend above)