From: Kyle Rose <krose@krose.org>
To: Charles Bailey <charles@hashpling.org>
Cc: git mailing list <git@vger.kernel.org>
Subject: Re: cookbook question
Date: Thu, 28 Feb 2008 18:08:03 -0500 [thread overview]
Message-ID: <47C73ED3.6000704@krose.org> (raw)
In-Reply-To: <20080228225838.GA31479@hashpling.org>
> I presume that origin/common contains changes to the common part of
> the config files that you want to apply to both machines. If the two
> machines' configs were originally branched from origin/common and then
> had there custom changes made and committed, you should just be able
> to merge subsequent changes from origin/common and not get conflicts
> unless there are genuinely changes to the parts of the configs that
> have been modified for the individual machines. I don't see a case for
> rebase in your example.
>
>
The rebase just avoids unnecessary merge records. What I really want is
my changes placed on top of whatever the common head is at any one time,
which by design means I would use rebase. Aside from the cleanliness of
the history, I'm not sure there is a real reason to do this. But I like
things clean. ;-)
Kyle
next prev parent reply other threads:[~2008-02-28 23:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-28 19:00 cookbook question Kyle Rose
2008-02-28 22:58 ` Charles Bailey
2008-02-28 23:08 ` Kyle Rose [this message]
2008-02-28 23:20 ` Charles Bailey
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=47C73ED3.6000704@krose.org \
--to=krose@krose.org \
--cc=charles@hashpling.org \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).