git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "James Sadler" <freshtonic@gmail.com>
To: git@vger.kernel.org
Subject: avoiding committing personal cruft
Date: Sat, 21 Jun 2008 23:20:06 +1000	[thread overview]
Message-ID: <e5e204700806210620m35fce27eh8eddaf7cb68f1986@mail.gmail.com> (raw)

I couldn't think of a better subject, so bear with me while I explain.

Let's say I am contributing to some upstream project, and I am hacking on it
inside my local repo's master branch.  Let's also say that I enjoy
using my favourite IDE
which creates its own project files and whatnot, and I don't want to
commit that stuff with the
rest of the project code.  It has no place being accidentally
pushed/pulled upstream.  It's
my personal cruft, hence the subject line.

However, I *do* want to version control my personal cruft, and I can
do that on a separate
branch.  But I want the content of that other branch to exist in the
working tree alongside my
checkout of master.

My current solution basically involves versioning the IDE files on
another branch (named ide-branch),
and using 'git checkout ide-branch .' to overlay the files on top of
the currently checked-out branch (master).

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.


 James.



-- 
Calvin Coolidge  - "I have never been hurt by what I have not said."

             reply	other threads:[~2008-06-21 13:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-21 13:20 James Sadler [this message]
2008-06-21 15:53 ` avoiding committing personal cruft David
     [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=e5e204700806210620m35fce27eh8eddaf7cb68f1986@mail.gmail.com \
    --to=freshtonic@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).