From: Chase Venters <chase.venters@clientec.com>
To: linux-kernel@vger.kernel.org
Cc: git@vger.kernel.org
Subject: Question about your git habits
Date: Fri, 22 Feb 2008 18:37:14 -0600 [thread overview]
Message-ID: <200802221837.37680.chase.venters@clientec.com> (raw)
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, do you tend to
clone the entire repository repeatedly into a series of separate working
directories 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?
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?
I'm using git to manage my project and I'm trying to determine the most
optimal workflow I can. I figure that I'm going to have an "official" master
repository for the project, and I want to keep the revision history clean in
that repository (ie, no messy intermediate commits that don't compile or only
implement a feature half way).
On older projects I was using a certalized revision control system like
*cough* Subversion *cough* and I'd create separate branches which I'd check
out into their own working trees.
It seems to me that having multiple working trees (effectively, cloning
the "master" repository every time I need to make anything but a trivial
change) would be most effective under git as well as it doesn't require
creating messy, intermediate commits in the first place (but allows for them
if they are used). But I wonder how that approach would scale with a project
whose git repo weighed hundreds of megs or more. (With a centralized rcs, of
course, you don't have to lug around a copy of the whole project history in
each working tree.)
Insight appreciated, and I apologize if I've failed to RTFM somewhere.
Thanks,
Chase
next reply other threads:[~2008-02-23 1:01 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-23 0:37 Chase Venters [this message]
2008-02-23 1:26 ` Question about your git habits Tommy Thorn
2008-02-23 1:28 ` Steven Walter
2008-02-23 1:37 ` Jan Engelhardt
2008-02-23 1:44 ` Al Viro
2008-02-23 1:51 ` Junio C Hamano
2008-02-23 2:09 ` Al Viro
[not found] ` <998d0e4a0802221823h3ba53097gf64fcc2ea826302b@mail.gmail.com>
2008-02-23 2:47 ` J.C. Pizarro
2008-02-23 11:39 ` Charles Bailey
2008-02-23 13:08 ` J.C. Pizarro
2008-02-23 13:17 ` Charles Bailey
2008-02-23 13:36 ` J.C. Pizarro
2008-02-23 14:01 ` Charles Bailey
2008-02-23 17:10 ` J.C. Pizarro
2008-02-23 18:16 ` Charles Bailey
2008-02-23 18:47 ` J.C. Pizarro
2008-02-23 19:28 ` Charles Bailey
2008-02-23 18:19 ` J.C. Pizarro
2008-02-23 14:08 ` Mike Hommey
2008-02-23 1:42 ` Junio C Hamano
2008-02-23 10:39 ` Samuel Tardieu
[not found] ` <998d0e4a0802221736q4e4c3a28l101522912f7d3caf@mail.gmail.com>
2008-02-23 2:46 ` J.C. Pizarro
2008-02-23 4:10 ` Daniel Barkalow
2008-02-23 5:03 ` Jeff Garzik
2008-02-23 9:18 ` Mike Hommey
2008-02-23 4:39 ` Rene Herman
2008-02-23 8:56 ` Willy Tarreau
2008-02-23 9:10 ` Sam Ravnborg
2008-02-23 13:07 ` Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200802221837.37680.chase.venters@clientec.com \
--to=chase.venters@clientec.com \
--cc=git@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).