diff options
| author | Karel Kočí <cynerd@email.cz> | 2017-05-07 19:30:37 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2017-05-07 19:30:37 +0200 |
| commit | e9112091089a8416fd7dc73b6220e6bdb66cc4ae (patch) | |
| tree | a5399be297bc71288361f12ccdf398b1fe7001f1 | |
| parent | 0f99bd8974b91b7e2b3da96a13b1063ff696eea8 (diff) | |
| parent | 05882344cc595918cdf07f21dc610c0e57c7f490 (diff) | |
| download | myconfigs-e9112091089a8416fd7dc73b6220e6bdb66cc4ae.tar.gz myconfigs-e9112091089a8416fd7dc73b6220e6bdb66cc4ae.tar.bz2 myconfigs-e9112091089a8416fd7dc73b6220e6bdb66cc4ae.zip | |
Merge branch 'master' into server
| -rw-r--r-- | shellrc | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -8,9 +8,10 @@ if [ "$(uname -s)" = "FreeBSD" ]; then alias ls='ls -G' else alias ls='ls --color=auto' + eval $(dircolors -b) + alias make="make -j$(nproc)" fi alias ll='ls -l' -eval $(dircolors -b) alias grep='grep --color=auto' alias git='LANG=en_GB git' alias gdb='gdb -q' @@ -18,7 +19,6 @@ alias cgdb='cgdb -q' alias octave='octave-cli -q' alias ssh='TERM="xterm-256color" ssh' alias feh='feh --magick-timeout 1 -.' -alias make="make -j$(nproc)" export LESS=-R export LESS_TERMCAP_mb=$'\E[1;31m' |