From: Tay Ray Chuan <rctay89@gmail.com>
Date: Sun, 07 Feb 2010 04:40:03 GMT
Subject: Re: how to apply patch?
Message-ID: <be6fef0d1002062040x6556b73fvb2a62a85fe21ec9e@mail.gmail.com>
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