*** Please tell me who you are.

Run

  git config --global user.email "you@example.com"
  git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: empty ident  <wonslung@wonslung-zbox.private.home> not allowed
wonslung-zbox:~/xbmc$ git merget xbmc-vdpau/master
git: 'merget' is not a git command. See 'git --help'.

Did you mean this?
	mergetool