summaryrefslogtreecommitdiff
path: root/.config/bash/rc.sh
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-04-16 10:42:42 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-04-16 10:42:42 -0400
commit12662331d4597a40b58ca0f37deed76e312389ef (patch)
tree7d8df92faa13daf4a26eb534215533b7d43d11a8 /.config/bash/rc.sh
parentc5fb55843c66f1ff6d4491009d9cf9781c0a3d7f (diff)
parent7000ec189d6aecca3cbee5c68fe877f11cf0784e (diff)
Merge remote-tracking branch 'origin/master' into build64-par
Diffstat (limited to '.config/bash/rc.sh')
-rw-r--r--.config/bash/rc.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/.config/bash/rc.sh b/.config/bash/rc.sh
index 2bf60bc..ab690cf 100644
--- a/.config/bash/rc.sh
+++ b/.config/bash/rc.sh
@@ -13,7 +13,8 @@ shopt -s checkhash
################################################################################
# History settings
-HISTCONTROL=ignoredups
+# don't overwrite GNU Midnight Commander's setting of `ignorespace'.
+HISTCONTROL=$HISTCONTROL${HISTCONTROL+,}ignoredups
HISTFILE=${XDG_CACHE_HOME}/bash/history
HISTTIMEFORMAT='[%Y-%m-%d %H:%M] '
HISTSIZE=5000
@@ -66,7 +67,7 @@ unset make_prompt
################################################################################
-# Load my alaises
+# Load my aliases
if [[ -f ${XDG_CONFIG_HOME}/bash/aliases.sh ]]; then
. ${XDG_CONFIG_HOME}/bash/aliases.sh
fi