Changed git shortcuts.

Signed-off-by: Jacob Kiers <jacob@alphacomm.nl>
This commit is contained in:
Jacob Kiers 2014-05-13 13:41:37 +02:00
parent e534a8de0e
commit f91e0e90ab
2 changed files with 10 additions and 17 deletions

View File

@ -11,18 +11,9 @@ alias c="composer"
alias o="open" alias o="open"
alias oo="open ." alias oo="open ."
alias e=$EDITOR alias e=$EDITOR
alias gh="github"
alias +x="chmod +x" alias +x="chmod +x"
alias x+="chmod +x" alias x+="chmod +x"
# Git
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 # Detect which `ls` flavor is in use
if ls --color > /dev/null 2>&1; then # GNU `ls` if ls --color > /dev/null 2>&1; then # GNU `ls`
colorflag="--color" colorflag="--color"

View File

@ -20,21 +20,23 @@
safecrlf = false safecrlf = false
mergeoptions = --no-edit mergeoptions = --no-edit
excludesfile = ~/.gitignore excludesfile = ~/.gitignore
[alias] [alias]
a = add a = add
ua = reset HEAD ap = add --patch
b = branch b = branch
c = commit --verbose c = commit --verbose --signoff
ca = commit -a --verbose cm = commit --verbose --signoff --message
cm = commit -m --verbose
cam = commit -am --verbose
co = checkout co = checkout
d = diff --color-words d = diff
s = status -sb ds = diff --staged
l = log --graph --pretty=format:'%C(magenta)%h%C(blue)%d%Creset %s %C(blue bold)- %an, %ar%Creset' l = log --graph --pretty=format:'%C(magenta)%h%C(blue)%d%Creset %s %C(blue bold)- %an, %ar%Creset'
ll = log --stat --abbrev-commit ll = log --stat --abbrev-commit
conflicts = diff --name-only --diff-filter=U r = rebase
s = status --short --branch
ua = reset HEAD
commerge = commit --no-edit commerge = commit --no-edit
conflicts = diff --name-only --diff-filter=U
[push] [push]
default = upstream default = upstream