diff options
| -rw-r--r-- | bash_aliases | 4 | ||||
| -rw-r--r-- | bashrc | 2 |
2 files changed, 4 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' @@ -122,6 +122,8 @@ fi # Custom prompt: # Blue timestamp and italic green pwd #PS1='\[\033[34m\]|\D{%H:%M:%S}| \[\033[3;32m\][\w]\[\033[00m\]\n\$ ' +# git-bash promp is helpful when browsing a git-repository +PS1='\[\033[32m\]\u@\h \[\033[35m\]$MSYSTEM \[\033[33m\]\w\[\033[36m\]`__git_ps1`\[\033[0m\]\n$ ' # Environmental variables: # less(1) config (ignore case in searchs and display raw control characters) |