I would modify slightly workflow that you have in order to avoid push --mirror.
- git clone /path/to/origin # clones the master
- git checkout --track origin/topic
- git checkout master
- git add some_new_file; git commit -m "added some new file"
- git push origin/master
- git checkout topic #Local branch
- git rebase master
- git push origin master #it will update master on origin
- git push --force origin/topic : it will update topic on origin
You need --force because origin/topic will change the ancestor and you have disable fast forward check.
db_
2009-08-19 23:06:45