I can't remember all this voodoo so maybe this will help.
git checkout --theirs . && git add .
git push origin :tagname
git rev-list --all --count
git rev-list HEAD --count
git branch --show-current
git shortlog -s -n
I can't remember all this voodoo so maybe this will help.
git checkout --theirs . && git add .
git push origin :tagname
git rev-list --all --count
git rev-list HEAD --count
git branch --show-current
git shortlog -s -n