summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGianni Ceccarelli <gianni.ceccarelli@broadbean.com>2020-06-17 14:04:01 +0100
committerGianni Ceccarelli <gianni.ceccarelli@broadbean.com>2020-06-17 14:04:01 +0100
commit63e651046f8f3c647ac71a854c4a5ef61fa66a81 (patch)
treeb2917152256965a8166b9fdbe6661b0680a862f9
parentbetter git config (diff)
downloaddotfiles-master.tar.gz
dotfiles-master.tar.bz2
dotfiles-master.zip
some git stuffHEADmaster
-rw-r--r--.bash_profile6
-rw-r--r--.gitconfig1
2 files changed, 7 insertions, 0 deletions
diff --git a/.bash_profile b/.bash_profile
index 7cd8fe4..23c06ed 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -44,6 +44,12 @@ function pm() {
emacsclient -c -n "$fn"
}
+function killmerged() {
+ for b in $(git branch --merged HEAD --no-contains HEAD|grep -vE 'stage|master|svn|develop'); do
+ git branch -d $b && git push origin :$b
+ done
+}
+
export PERLDOC='-MPod::Text::Color::Delight'
fortune
diff --git a/.gitconfig b/.gitconfig
index ff5df52..478387c 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -54,3 +54,4 @@
refl = log -g --oneline 'HEAD@{now}' --date=relative
st = status -bs
tracked = ls-tree -r --name-only --full-name HEAD
+ stashed = stash list --pretty=format:'%gd: %Cred%h%Creset %Cgreen[%ar]%Creset %gs'