Q. regarding subtree merge

Hi all.

I tried the scenario described in $GIT_DIR/Documentation/howto/using-merge-subtree.txt and have some problems with it.

My setup:

I use git to track my changes in three different "project directories", lets say:

...../src_root/libfoo ...../src_root/appbar ...../bin_root/installed

All three git repositories contain a topic branch (lets say 'current-work') that I want to track.

Now I want to setup one git repository containing only the three directories 'libfoo', 'appbar', and 'installed' that others can clone easily. Reading the above howto document, I think this should be possible.

I do:

  $ mkdir super-prj 
  $ cd super-prj 
  $ git init
  $ git add remote -f libfoo ../path/to/src_root/libfoo

OK. No problem. 

The problem arises after the second step of the howto:

  $ git merge -s ours --no-commit libfoo/current-work

Now, all files of 'libfoo' are in the current directory. This is not what I want.

Could someone please tell me what I'm doing wrong?

Thanks

Stefan