Merge two repositories

merge_repos.sh

mkdir repo_merge
cd repo_merge

git clone zaki/test_server
git clone zaki/test_client

## PREPROCESS SERVER
cd test_server
git remote rm origin # precaution

# move all files with history to server/
git filter-branch --index-filter 'git ls-files -s | sed "s-	\"*-&server/-" | GIT_INDEX_FILE=$GIT_INDEX_FILE.new git update-index --index-info && mv "$GIT_INDEX_FILE.new" "$GIT_INDEX_FILE"' HEAD

## PREPROCESS CLIENT
cd test_client
git remote rm origin # precaution

# move all files with history to client/
git filter-branch --index-filter 'git ls-files -s | sed "s-	\"*-&client/-" | GIT_INDEX_FILE=$GIT_INDEX_FILE.new git update-index --index-info && mv "$GIT_INDEX_FILE.new" "$GIT_INDEX_FILE"' HEAD

## MERGE SERVER INTO CLIENT
git remote add -f server ../test_server
git merge server/master

git remote rm server

## RESULTS IN
## client/
##   L---client contents
## server/
##   L---server contents