Re: Merging (only) subdirectories

2010/12/1 "Martin Krüger" [off-list ref]:

quoted

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

thanks Martin,

There's a whole bunch of stuff there that I am not familiar with so I
need to do some reading!  When you say we are not using best practices
can you elaborate? I am very open to improving the way we do things.

Howard