diff options
| -rw-r--r-- | bash/colors.sh | 2 | ||||
| -rw-r--r-- | git/gitconfig.ini | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/bash/colors.sh b/bash/colors.sh index 7548803..6266c10 100644 --- a/bash/colors.sh +++ b/bash/colors.sh @@ -104,7 +104,7 @@ if [ $? -eq 0 ]; then \ else \ # @5 - Changes to working tree echo "'$IRed'"$(__git_ps1 " {%s}")"'$Color_Off'"; \ - fi)" - $(echo "'$IBlack'"`git sha | head -c 7`"'$Color_Off'"); \ + fi)" - $(echo "'$IBlack'"`git sha7`"'$Color_Off'"); \ fi)$(if [[ $IN_NIX_SHELL == 1 ]]; then\ echo "\n'$IBlack'~>'$Color_Off' '$Purple'nix-shell'$Color_Off' ('$BIBlue'$name'$Color_Off')'$Color_Off'" ;\ fi)$(echo "\n'$BIPurple'\$'$Color_Off' ";)' diff --git a/git/gitconfig.ini b/git/gitconfig.ini index 1fcf7f8..45a9af9 100644 --- a/git/gitconfig.ini +++ b/git/gitconfig.ini @@ -30,6 +30,7 @@ graph = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative co = checkout sha = rev-parse HEAD + sha7 = ! git sha | head -c 7 prune-branches = !git branch --merged | grep -v master | xargs git branch -d lfs-pull = !git fetch && git lfs fetch --recent && git merge origin podcasts = !xargs git-annex importfeed < feeds.conf |