Change prompt to lambda

.bash_aliases

@@ -17,6 +17,8 @@ alias gcom="git checkout master"
 alias gpom="git pull origin master"
 alias gbd="git branch -D"
 alias gm="git mergetool"
+alias gmc="git merge --continue"
+alias grc="git rebase --continue"
 
 # tmux
 alias tm="tmux -2 attach-session -t "default" || tmux -2 new-session -s \"default\""

.bashrc

@@ -1,7 +1,7 @@
 # Set prompt
 IFS='.' read -ra split_hostname <<<$(hostname | tr '[:upper:]' '[:lower:]')
 HOSTNAME=${split_hostname[0]}
-PS1='\[\e[1;4;36m\]$HOSTNAME\[\e[1;0m\] \[\e[1;32m\]\w\[\e[m\]\[\e[1;0m\] \[\e[0m\] \[\e[1;0m\]'
+PS1='\[\e[1;4;31m\]$HOSTNAME\[\e[1;0m\] \[\e[1;32m\]\w\[\e[m\]\[\e[1;0m\] λ\[\e[0m\] \[\e[1;0m\]'
 export TERM=xterm-256color
 
 shopt -s cdspell
@@ -56,8 +56,8 @@ export EDITOR='code -w'
 
 # bash-git-prompt
 GIT_PROMPT_ONLY_IN_REPO=1
-GIT_PROMPT_START="\[\e[1;4;36m\]$HOSTNAME\[\e[1;0m\] \[\e[1;32m\]\w\[\e[m\]"
-GIT_PROMPT_END="\[\e[1;m\]  \[\e[1;m\]"
+GIT_PROMPT_START="\[\e[1;4;31m\]$HOSTNAME\[\e[1;0m\] \[\e[1;32m\]\w\[\e[m\]"
+GIT_PROMPT_END="\[\e[1;m\] λ \[\e[1;m\]"
 
 
 # Disable deprecation warning on mac

.gitconfig

@@ -23,6 +23,7 @@
     undo = reset --soft HEAD^
     squash = rebase --autostash -i
     megasquash = "!f() { git rebase --autostash -i `git merge-base --fork-point HEAD master`; }; f"
+    unstage = restore --staged
 
     # various pretty loggers from various places
     l = log --pretty=oneline --abbrev-commit