Merge branch 'master' of https://notabug.org/envrm/shellrc

etc/shell/bash/bashrc_macos

@@ -1,4 +1,4 @@
-PATH="/usr/local/opt/coreutils/libexec/gnubin/:/Applications/:~/go/bin/:~/Library/Python/3.7/bin/:$HOME/.cabal/bin:${GHCUP_INSTALL_BASE_PREFIX:=$HOME}/.ghcup/bin:$PATH"
+PATH="/usr/local/opt/ruby/bin:/usr/local/opt/coreutils/libexec/gnubin/:/Applications/:~/go/bin/:~/Library/Python/3.7/bin/:$HOME/.cabal/bin:${GHCUP_INSTALL_BASE_PREFIX:=$HOME}/.ghcup/bin:$PATH"
 
 test -e "${HOME}/.iterm2_shell_integration.bash" && source "${HOME}/.iterm2_shell_integration.bash"
 

etc/soft/git/gitconfig

@@ -43,7 +43,7 @@
 	co = checkout
 
 	lf = log --source --graph --stat --date=iso --pretty=medium --decorate=full
-	ls = log --graph --pretty=format:'%Cred%h%Creset - %Cgreen[%cd]%Creset ::%C(yellow)%d%Creset %s %C(bold blue)%Creset' --abbrev-commit --date=short
+	ls = log --graph --pretty=format:'%Cred%h%Creset - %Cgreen[%cd]%Creset ::%C(yellow)%d%Creset %s %C(bold blue)<%an>%Creset' --abbrev-commit --date=short
 	ll = !git --no-pager log -1 HEAD && echo
 	lu = !git --no-pager log --left-right --pretty=format:'%C(yellow)%h%Creset - %Cgreen[%cd]%Creset :: %s %C(bold blue)%Creset' --abbrev-commit --graph --color --date=short origin/master...HEAD | nl