From: Kyle Rose <krose@krose.org>
To: git mailing list <git@vger.kernel.org>
Subject: cookbook question
Date: Thu, 28 Feb 2008 14:00:11 -0500 [thread overview]
Message-ID: <47C704BB.2010707@krose.org> (raw)
In maintaining a postfix config that differs maybe 10% between two
different machines, I have a "common" branch that has ???? in the fields
that differ. I realized after speaking with one of the git developers a
few weeks ago that I really should be using git-rebase to fix up the
machine-specific branches when I make a change to the common branch.
Unfortunately, the merge history was screwed up enough such that doing
git rebase -s ours origin/common
replaced one machine-specific config with the other, which is not what I
wanted.
In order to reset things to a state in which git-rebase would be useful,
I did the following:
git diff origin/common >/tmp/diff
git reset --hard origin/common
patch -p1 </tmp/diff
git commit -a -m 'reintroduce changes'
which works fine, but is obviously not the right way to do this. What
*is* the right way to accomplish this? Essentially, I'm trying to reset
the rebase point such that git won't rewind earlier when trying to do
subsequent rebases.
Kyle
next reply other threads:[~2008-02-28 19:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-28 19:00 Kyle Rose [this message]
2008-02-28 22:58 ` cookbook question Charles Bailey
2008-02-28 23:08 ` Kyle Rose
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=47C704BB.2010707@krose.org \
--to=krose@krose.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).