dot

packages and services management
Log | Files | Refs | README

commit 2287a00679467602817980d3704bb37d39b46298
parent 46c636ccbd50d15f25555138dbb095264f15318b
Author: Josuah Demangeon <josuah.demangeon@gandi.net>
Date:   Wed, 28 Jun 2017 20:01:52 +0200

Merge branch 'master' of http://github.com/josuah/etc

Diffstat:
Mbin/git-status | 10+++++++---
Mbin/l | 5+++--
Mgit/.gitconfig | 4++++
Mst/build | 2+-
4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/bin/git-status b/bin/git-status @@ -1,4 +1,6 @@ -git rev-parse 2> /dev/null && git status --porcelain -b | awk ' +git rev-parse 2> /dev/null || exit + +git status --porcelain -b | awk ' /^## / { branch = $0; @@ -36,6 +38,8 @@ END { if (conflicts) printf(" \033[31mx\033[m%d", conflicts); if (changed ) printf(" \033[32m+\033[m%d", changed); if (staged ) printf(" \033[34m#\033[m%d", staged); - if (behind ) printf(" \033[35mv\033[m%d", behind); - if (ahead ) printf(" \033[36m^\033[m%d", ahead); + if (behind ) printf(" \033[35m↓\033[m%d", behind); + if (ahead ) printf(" \033[36m↑\033[m%d", ahead); }' + +[ -d "$(git rev-parse --git-dir)/rebase-merge" ] && printf ' rebase' diff --git a/bin/l b/bin/l @@ -1,2 +1,3 @@ -ls -l "$@" | grep -e '^d' -ls -l "$@" | grep -v -e '^d' -e '^total' +ls -lp "$@" | grep -e '^d' 2> /dev/null +ls -lp "$@" | grep -v -e '^d' -e '^total' +true diff --git a/git/.gitconfig b/git/.gitconfig @@ -1,3 +1,7 @@ [user] email = josuah.demangeon@gandi.net name = Josuah Demangeon + +[alias] + graph = log --branches --remotes --tags --graph --decorate --oneline --color=never + diff --git a/st/build b/st/build @@ -2,7 +2,7 @@ cp -f "$ETC/build/st/config.mk" config.mk find "$ETC/build/st/" -name '*.diff' | xargs patch -N -p 1 -i -sed 's/gray90/#ffeecc/' config.def.h > config.h +sed 's/gray90/#ffeedd/; s/black/#001115/' config.def.h > config.h make PREFIX="$PREFIX" install