summaryrefslogtreecommitdiffstats
path: root/bash_aliases
diff options
context:
space:
mode:
authorMitsuo Tokumori <[email protected]>2022-06-17 21:48:32 -0500
committerMitsuo Tokumori <[email protected]>2022-06-17 21:48:32 -0500
commit66eb0f76c8c63c80bc63b5580b01b2d8026ad6af (patch)
treeb819d82786481582ae8970548a7c38551e361cae /bash_aliases
parent257d976ed229f19b491b7d41dc6c73d3943c1db6 (diff)
downloaddotfiles-66eb0f76c8c63c80bc63b5580b01b2d8026ad6af.tar.gz
dotfiles-66eb0f76c8c63c80bc63b5580b01b2d8026ad6af.tar.bz2
dotfiles-66eb0f76c8c63c80bc63b5580b01b2d8026ad6af.zip
Modify PS1, create alias for diff
Diffstat (limited to 'bash_aliases')
-rw-r--r--bash_aliases4
1 files changed, 2 insertions, 2 deletions
diff --git a/bash_aliases b/bash_aliases
index 185c040..cd39928 100644
--- a/bash_aliases
+++ b/bash_aliases
@@ -10,7 +10,8 @@ alias jupyter-lab='jupyter-lab . &> /dev/null &' # Redirect stdout and stderr
# ======================================================================
# coretools
-alias diff2='diff --color=always -y'
+alias diff2='diff --color=always -ys' # side by side, tell if file identical
+alias diff='diff --color=always'
alias dir='dir --color=auto'
alias grep='grep --color=auto -i' # color case-insensitive
alias la='ls -A'
@@ -20,7 +21,6 @@ alias ls='ls --color=auto --group-directories-first --classify'
alias gcc='gcc -g -std=c99 -lm'
alias ed='ed -p "* "'
-alias diff='diff -s'
alias gitlogpretty='git log --all --graph --decorate --abbrev-commit'