import the repository to be merged in as a branch

git fetch $reptomerge HEAD:tomerge

and merge it in the current master

git merge (--no-commit) tomerge