From: Michael J Gruber <git@drmicha.warpmail.net>
To: Jez Caudle <jezcaudle@me.com>
Cc: Jez Caudle <gitmailinglist@me.com>, git@vger.kernel.org
Subject: Re: Only the config file changes ...
Date: Tue, 02 Mar 2010 15:46:51 +0100 [thread overview]
Message-ID: <4B8D24DB.3080007@drmicha.warpmail.net> (raw)
In-Reply-To: <1463530E-F729-46CA-881D-A89E6CF89241@me.com>
Jez Caudle venit, vidit, dixit 02.03.2010 14:26:
> Sounds good.
>
> The only problem being I find a bug in version C. I fix it in version
> C,
Don't do that :)
> now I want to merge that change back to the master and then out to
> A,B and then D.
>
If you've done that anyways, you can still cherry-pick that change onto
master, or merge --no-commit and checkout --ours what you don't want merged.
>
> I'm still reading my Git book but I'm thinking of doing it this way:
>
> Master has it's own repository. Each version has it's own repository
> that is created by cloning the Master and then removing all the files
> that are not specific removed from the repository. When changes are
> made to the master then simply copy all the non-specific files to
> each of the versions.
I don't think you need to remove any files - you do need them for
testing, don't you? It's just that you don't want to modify them in your
"specific" client repos.
Michael
prev parent reply other threads:[~2010-03-02 14:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-02 12:06 Only the config file changes Jez Caudle
2010-03-02 13:16 ` Michael J Gruber
2010-03-02 13:26 ` Jez Caudle
2010-03-02 14:46 ` Michael J Gruber [this message]
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=4B8D24DB.3080007@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitmailinglist@me.com \
--cc=jezcaudle@me.com \
/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).