All of lore.kernel.org
 help / color / mirror / Atom feed
From: "\"Martin Krüger\"" <martin.krueger@gmx.com>
To: Howard Miller <howard@e-learndesign.co.uk>, git@vger.kernel.org
Subject: Re: Merging (only) subdirectories
Date: Wed, 01 Dec 2010 12:47:59 +0100	[thread overview]
Message-ID: <20101201114759.136280@gmx.net> (raw)
In-Reply-To: <AANLkTimZc0r8WBOsE73V=7SKdZgONiCKfYCk7rBrCY3F@mail.gmail.com>


> 
> The problem comes when Client A wants to purchase Theme B. We can't
> just merge the theme branch because all the rest of the project
> contains (potentially) a different version of Moodle. So we have to do
> lots of messing around to get the theme branch in and/or loose the
> theme commit history in the process.
> 
I would say you are not working best practice with git. The idea of commit is a atomic  change of the whole project.  It seems like you mixed completely unrelated changes in a commit.

You can try as a resolution:
git rebase master  (on a temporary-branch)
git format-patch master

Strip the patches with filterdiff

Apply the stripped patches to another temporary-brach.
Merge to the target-Branch.

Best regards
     martin

  reply	other threads:[~2010-12-01 11:48 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-01 11:18 Merging (only) subdirectories Howard Miller
2010-12-01 11:47 ` "Martin Krüger" [this message]
2010-12-01 11:56   ` Howard Miller
2010-12-01 11:59   ` Howard Miller
2010-12-01 12:36 ` Nguyen Thai Ngoc Duy
2010-12-01 12:55   ` Howard Miller
2010-12-03 10:59   ` Enrico Weigelt
2010-12-03 11:12     ` Howard Miller
2010-12-03 20:38       ` Enrico Weigelt

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=20101201114759.136280@gmx.net \
    --to=martin.krueger@gmx.com \
    --cc=git@vger.kernel.org \
    --cc=howard@e-learndesign.co.uk \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.