Here’s a pretty common git error message if you’ve added a remote origin server manually.

You asked me to pull without telling me which branch you
want to merge with, and ‘branch.master.merge’ in
your configuration file does not tell me, either. Please
specify which branch you want to use on the [...]

There’s an overwhelming amount of git tools, and if you’re coming from SVN you might expect that the tools w/ the same names work the same way. You’d be wrong.

Because of Git’s distributed nature, you can (and frequently do) have commits in your repo that you might not have pushed up. You might also [...]

Useful stuff.

git filter-branch -f –index-filter ‘git update-index –remove filename’ HEAD git push –force –verbose –dry-run git push –force

Slight better version. Only rewrites history from the first commit the file existed.

git filter-branch -f –index-filter ‘git update-index –remove filename’ ..HEAD git push –force –verbose –dry-run git push –force

Found on github.