minor bash prompt update + git branch alias

main
Steffen Becker 12 years ago
parent 7a645d8172
commit 45cc134b9b

@ -29,7 +29,7 @@
st = status
cm = commit
co = checkout
br = branch
br = branch -a
ps = push
pl = pull
mg = merge

@ -74,14 +74,14 @@ alias gw='grunt watch'
# custom bash with current git branch
function parse_git_dirty {
[[ $(git status 2> /dev/null | tail -n1) != "nothing to commit (working directory clean)" ]] && echo "*"
[[ $(git status 2> /dev/null | tail -n1) != "nothing to commit (working directory clean)" ]] && echo " *"
}
function parse_git_branch {
git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e "s/* \(.*\)/[\1$(parse_git_dirty)]/"
git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e "s/* \(.*\)/(\1$(parse_git_dirty))/"
}
export PS1='\u@\h | \w\[\033[0;33m\] $(parse_git_branch) \[\033[00m\]$ '
export PS1='[\u \[\033[1;34m\]\w\[\033[0;33m\] $(parse_git_branch)\[\033[00m\]]$ '
# use ffmpeg to create nice web-videos and a jpg-still
ffencode () {

@ -1 +1 @@
Subproject commit c35bf8ed1732e6a0b8fbaad558692b3a2484745e
Subproject commit f2b1eb9ce6d72e91b27ccd1db5b33d6a1e7f3937

@ -1 +1 @@
Subproject commit 3e02137acd8c9fd5235b9afeae8a7675296aef77
Subproject commit f45d9383c6286250f910043573a976889a6798db

@ -1 +1 @@
Subproject commit 224bc932bc4a300abad79df38f8e3e4b16fe2edc
Subproject commit 2f639ea61ab037e7862228d54a1c292f59c2385f

@ -1 +1 @@
Subproject commit 3f52de449280badc57c0d41014e64d051166e741
Subproject commit fc75101f6db32ae088328f3f42495c89abf13e46

@ -1 +1 @@
Subproject commit d9d95a62873af3b36faa338fa6ed9d7de609d29f
Subproject commit 2f1db375af69f28e0a8ee00eacdaca7dfd309418

@ -1 +1 @@
Subproject commit ec0ae34e981627e05f6441c77b4e0aa3e8cc99ff
Subproject commit 4d55a4b55666a5846956655e1a1ca30004702b06
Loading…
Cancel
Save