From 676308091635f8f80939443826dea2b5cf60f5d1 Mon Sep 17 00:00:00 2001
From: Gianni Ceccarelli <gianni.ceccarelli@broadbean.com>
Date: Tue, 7 Apr 2020 17:27:59 +0100
Subject: never wait for e

---
 .bash_profile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.bash_profile b/.bash_profile
index 6451c08..7cd8fe4 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -14,11 +14,11 @@ export GPG_TTY="$(tty)"
 eval "$(keychain --eval --inherit any-once --agents ssh id_rsa id_ed25519)"
 
 function e() {
-    emacsclient "$@"
+    emacsclient -n "$@"
 }
 
 function se() {
-    emacsclient "${@/#//sudo::}"
+    emacsclient -n "${@/#//sudo::}"
 }
 
 function pd() {
-- 
cgit v1.2.3


From 04f753a4aad2c237fe85c48e91b4796b0b8b5cab Mon Sep 17 00:00:00 2001
From: Gianni Ceccarelli <gianni.ceccarelli@broadbean.com>
Date: Tue, 7 Apr 2020 17:28:33 +0100
Subject: better git config

---
 .gitconfig | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index 3ba30d2..ff5df52 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,15 +14,28 @@
         showbranch = true
         status = true
 
+[color.diff]
+        oldMoved = normal red
+        oldMovedDimmed = normal red dim
+        oldMovedAlternative = normal red italic
+        oldMovedAlternativeDimmed = normal red italic dim
+        newMoved = normal green
+        newMovedDimmed = normal green dim
+        newMovedAlternative = normal green italic
+        newMovedAlternativeDimmed = normal green italic dim
+
 [fetch]
-        prune = true
+	prune = true
+[fetch.fsck]
+        zeroPaddedFilemode = warn
 [push]
 	default = tracking
 [pull]
-        rebase = preserve
+        rebase = merges
 [diff]
         mnemonicprefix = true
         renames = copies
+        colorMoved = zebra
 [log]
         decorate = short
         date = iso
-- 
cgit v1.2.3


From 63e651046f8f3c647ac71a854c4a5ef61fa66a81 Mon Sep 17 00:00:00 2001
From: Gianni Ceccarelli <gianni.ceccarelli@broadbean.com>
Date: Wed, 17 Jun 2020 14:04:01 +0100
Subject: some git stuff

---
 .bash_profile | 6 ++++++
 .gitconfig    | 1 +
 2 files changed, 7 insertions(+)

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'
-- 
cgit v1.2.3