From 46a8e46bef1d1ba0de143e71bd83b61f23655ee6 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Thu, 4 Oct 2018 18:20:52 +0100
Subject: pull-rebase-preserve!

---
 .gitconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitconfig b/.gitconfig
index f15daf3..3ba30d2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -19,7 +19,7 @@
 [push]
 	default = tracking
 [pull]
-        rebase = true
+        rebase = preserve
 [diff]
         mnemonicprefix = true
         renames = copies
-- 
cgit v1.2.3


From a05cbe7d61ce251e550033af1e862d9102ee443c Mon Sep 17 00:00:00 2001
From: Gianni Ceccarelli <gianni.ceccarelli@broadbean.com>
Date: Wed, 30 Jan 2019 12:07:25 +0000
Subject: more colours in bash

---
 .inputrc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.inputrc b/.inputrc
index 1c592ed..0205ecf 100644
--- a/.inputrc
+++ b/.inputrc
@@ -1,5 +1,8 @@
 set show-all-if-ambiguous on
 set visible-stats on
+set colored-stats on
+set colored-completion-prefix on
+
 "\e[A": history-search-backward
 "\e[B": history-search-forward
 "\es": menu-complete
-- 
cgit v1.2.3