In git:
Thanks in advance!
To (briefly) answer your questions...
merge
vs rebase
is well discussed in this question.git
directory within a normal repo. Try it yourself git init --bare bare; ls -la bare
As other has suggested, read up on Git:
I recommend Git SCM and especially the Git Book for getting started.