From: Tay Ray Chuan <rctay89@gmail.com>
To: Matt Di Pasquale <liveloveprosper@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: how to apply patch?
Date: Sun, 7 Feb 2010 12:40:03 +0800 [thread overview]
Message-ID: <be6fef0d1002062040x6556b73fvb2a62a85fe21ec9e@mail.gmail.com> (raw)
In-Reply-To: <13f0168a1002061805o5d64c05cy9d8f0190a8f37feb@mail.gmail.com>
Hi,
On Sun, Feb 7, 2010 at 10:05 AM, Matt Di Pasquale
<liveloveprosper@gmail.com> wrote:
> [snip]
> Then, copy dev to pro, then reapply/rebase the essential
> differences to pro that got wiped out. if i rebase though, i want to
> be able to rebase again on the next edit.
> what's a good way to do this?
you could put this in your config:
[remote local]
url = .
fetch = dev
[branch "pro"]
remote = local
rebase = true
When you're wish to incorporate your latest changes in "dev" into
"pro(duction)",
$ git checkout pro #assuming you're not already on "pro"
$ git pull
Repeat ad nauseum.
--
Cheers,
Ray Chuan
next prev parent reply other threads:[~2010-02-07 4:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <13f0168a1002061720t93ff6aew3420a41a547549d8@mail.gmail.com>
2010-02-07 2:05 ` Fwd: how to apply patch? Matt Di Pasquale
2010-02-07 4:40 ` Tay Ray Chuan [this message]
2010-02-07 6:06 ` Matt Di Pasquale
2010-02-07 13:00 ` Tay Ray Chuan
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=be6fef0d1002062040x6556b73fvb2a62a85fe21ec9e@mail.gmail.com \
--to=rctay89@gmail.com \
--cc=git@vger.kernel.org \
--cc=liveloveprosper@gmail.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).