move git log decoration beside hash

Decoration beside hash turns out to be a more useful pairing of data. We also
remove graphing from `glb` as it's not necessary, and we also don't list merge
commits.

zsh/omz-custom/git.zsh

@@ -11,9 +11,9 @@ alias gf='git fetch'
 alias gbd='git branch -D'
 
 ## standard log with train tracks
-alias gl='git log --graph --pretty="format:%C(yellow)%h %Cblue[%an] %Creset%s...%C(cyan)%ar%Cgreen%d"'
+alias gl='git log --graph --pretty="format:%C(yellow)%h%Cgreen%d %Cblue[%an] %Creset%s... %C(cyan)%ar"'
 ## concise, branch-only log with train tracks
-alias glb='git log --graph --all --simplify-by-decoration --pretty="format:%C(yellow)%h %Cblue[%an] %Creset%s... %C(cyan)%ar%Cgreen%d"'
+alias glb='git log --all --simplify-by-decoration --no-merges --pretty="format:%C(yellow)%h%Cgreen%d %Cblue[%an] %Creset%s... %C(cyan)%ar"'
 ## search through history for particular text
 alias glS='git log -S'
 alias glp='git log --patch'