From: David <wizzardx@gmail.com>
To: git@vger.kernel.org
Subject: Re: avoiding committing personal cruft
Date: Sat, 21 Jun 2008 17:53:13 +0200 [thread overview]
Message-ID: <18c1e6480806210853k72274173gaaeb11dd7991c8ed@mail.gmail.com> (raw)
In-Reply-To: <e5e204700806210620m35fce27eh8eddaf7cb68f1986@mail.gmail.com>
On Sat, Jun 21, 2008 at 3:20 PM, James Sadler <freshtonic@gmail.com> wrote:
>
> The ide-branch has nothing in it except the cruft from the IDE and the
> paths leading up to that cruft.
> The master branch has a .gitignore that ignores the IDE files so I
> won't end up polluting master by accident.
>
> It's a manageable solution for now. I tend to think of it
> conceptually as 'layering' two branches: I want the
> content of both present in the working tree.
>
> I was just wondering if anyone else has tried something similar.
>
Sounds like a normal use of topic branches. Branches rebased against
master, where you you keep changes you don't want to go into the main
branch at this time.
David.
next prev parent reply other threads:[~2008-06-21 15:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-21 13:20 avoiding committing personal cruft James Sadler
2008-06-21 15:53 ` David [this message]
[not found] ` <e5e204700806211901v17a0450fw56b9db1c8c578dd@mail.gmail.com>
2008-06-22 7:58 ` David
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=18c1e6480806210853k72274173gaaeb11dd7991c8ed@mail.gmail.com \
--to=wizzardx@gmail.com \
--cc=git@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).