Reorder git aliases and move completion

Most often used aliases are now at the top, less often (or even never
used or simply copied from elsewhere) are at the bottom.
Completion for each alias is now below each alias
Add also another bunch of completions