git: Merge the "ls" and "locate" aliases

"ls" was not working anyway because it was missing the tree-ish.
git: Reorder aliases a bit for a better overview
git-rename-remote-branch: Simplify the script to be a real one-liner