tobiass-mbp:supertux tobiasmarkus1$ git rebase origin/master
Cannot rebase: You have unstaged changes.
Please commit or stash them.
tobiass-mbp:supertux tobiasmarkus1$ git reset --hard HEAD
HEAD is now at b503e0a Added 1px transparent border to most fonts, left a few out since glyph count doesn't match image size
tobiass-mbp:supertux tobiasmarkus1$ git rebase origin/master
Cannot rebase: You have unstaged changes.
Please commit or stash them.
tobiass-mbp:supertux tobiasmarkus1$