gistfile1.txt

$ mkdir test123
$ cd test123
$ git init
$ git remote add jaikiran-ep git://github.com/jaikiran/jboss-ejb3-calendar-expr-parser.git
$ git pull jaikiran-ep master
$ git remote add jaikiran-tmk2 git://github.com/jaikiran/jboss-ejb3-timerservice-mk2.git
$ git fetch jaikiran-tmk2
$ mkdir ejb31-calendar-expr-parser
$ mv * ejb31-calendar-expr-parser/
$ git add ejb31-calendar-expr-parser
$ git commit -a
[master dafbe3b] Moved ejb31-calendar-expr-parser
$ git checkout -b merge-tmk2 remotes/jaikiran-tmk2/master
$ mkdir timerservice-mk2
$ mv * timerservice-mk2/
$ git add timerservice-mk2
$ git commit -a
[merge-tmk2 d674977] Moved timerservice-mk2
$ git checkout master
$ git merge merge-tmk2