Update aliases

Signed-off-by: Jacob Kiers <jacob@jacobkiers.net>

includes/bash_aliases.bash

@@ -7,6 +7,7 @@ alias ~="cd ~"
 alias -- -="cd -"  # The alias is `-`, not `--`
 
 # Shortcuts
+alias c="composer"
 alias dr="cd ~/Dropbox"
 alias pj="cd ~/Dropbox/Projects"
 alias pjr="cd ~/Dropbox/Projects/_Repos"
@@ -25,6 +26,8 @@ alias gs="git status"
 alias gd="git diff"
 alias gds="git diff --staged"
 alias gc="git commit -sv"
+alias rb="git rebase"
+alias rbi="git rebase -i"
 
 # Detect which `ls` flavor is in use
 if ls --color > /dev/null 2>&1; then  # GNU `ls`
@@ -40,9 +43,6 @@ export LS_COLORS="no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40
 # Enable aliases to be sudo’ed
 alias sudo="sudo "
 
-# Avoid stupidity
-alias rm="rm -i"
-
 # Gzip-enabled `curl`
 #alias gurl="curl --compressed"
 
@@ -57,9 +57,6 @@ alias dotfiles="pushd "$HOME/dotfiles" > /dev/null 2>&1; git pull && ./sync.py &
 # Clean up LaunchServices to remove duplicates in the “Open With” menu
 #alias lscleanup="/System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister -kill -r -domain local -domain system -domain user && killall Finder"
 
-# Trim new lines and copy to clipboard
-alias c="tr -d '\n' | pbcopy"
-
 # Recursively delete `.DS_Store` files
 alias cleanup="find . -type f -name '*.DS_Store' -ls -delete"