Git - How do I override a folder on master branch with a folder on a branch

Question

Possible Duplicate:
How to merge a branch into another with override option in git

I have some folders on a branch, I want them to just override the same folders on master.

I dont want to go through merge.. I just want a straight replace.

Any ideas how to do this in Git? Thanks

do you mean you want to replace these folders by what's on `master`? — CharlesB, Aug 29 '12 at 12:38
or you want to update `master` to be the same as your branch? — CharlesB, Aug 29 '12 at 12:39

score 5 · Accepted Answer · answered Aug 29 '12 at 12:51

This is really quite simple:

git checkout master
git checkout <branch> -- <directory>

The first command puts you on master. The second takes all the diffs between <branch> and master in <directory> and stages them for commit.

Now just issue git commit as you normally would.

score 0 · Answer 2 · answered Aug 29 '12 at 12:38

0

Delete master. And commit new files to it.

answered Aug 29 '12 at 12:38

pain.reign

I just want the specific folders on my branch to replace the ones on master. – user1340971 Aug 29 '12 at 12:43

score 0 · Answer 3 · answered Aug 29 '12 at 12:43

0

Try something like this:

answered Aug 29 '12 at 12:43

defuz

3 Answers3