aboutsummaryrefslogtreecommitdiffstats
path: root/home-dots
diff options
context:
space:
mode:
Diffstat (limited to 'home-dots')
-rw-r--r--home-dots/dot-bashrc2
-rw-r--r--home-dots/dot-gitconfig4
2 files changed, 6 insertions, 0 deletions
diff --git a/home-dots/dot-bashrc b/home-dots/dot-bashrc
index 1641221..8829999 100644
--- a/home-dots/dot-bashrc
+++ b/home-dots/dot-bashrc
@@ -5,6 +5,8 @@
# If not running interactively, don't do anything
[[ $- != *i* ]] && return
+# If emacs tramp or eshell, don't execute any of this
+[[ $TERM == "dumb" ]] && return
HISTSIZE=-1
HISTFILESIZE=-1
diff --git a/home-dots/dot-gitconfig b/home-dots/dot-gitconfig
index 11cff2d..c080709 100644
--- a/home-dots/dot-gitconfig
+++ b/home-dots/dot-gitconfig
@@ -1,3 +1,4 @@
+# -*- mode: conf-unix; -*-
[user]
name = Oscar Najera
email = hi@oscarnajera.com
@@ -21,3 +22,6 @@
cmd = compare $REMOTE $LOCAL png:- | montage -font Liberation-Sans -tile 3x -geometry 400x -label "reference" $LOCAL -label "diff" - -label "current--%f" $REMOTE x:
[diff]
algorithm = histogram
+
+[includeIf "gitdir:~/bytegit/**"]
+ path = ~/bytegit/.gitconfig