Skip to content

Instantly share code, notes, and snippets.

@juanfgs
Created March 14, 2016 13:42

Revisions

  1. juanfgs created this gist Mar 14, 2016.
    29 changes: 29 additions & 0 deletions aliases.txt
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,29 @@
    [alias]
    brr = branch -r
    br = branch
    ci = commit -m
    cia = commit -a -m
    amend = commit --amend -C HEAD
    co = checkout
    cob = checkout -b
    st = status -sb
    me = merge --no-ff
    fo = fetch origin
    pu = push origin
    ds = diff --staged
    unci = reset HEAD
    undo = reset --soft HEAD^
    hash = log --pretty=format:'%h' -n 1
    ls = log --pretty=format:'%C(yellow)%h %C(blue)%ad%C(red)%d %C(reset)%s%C(green) [%cn]' --decorate --date=short
    longhash = rev-parse HEAD
    standup = log --since '1 day ago' --oneline --author [email]
    standup-week = log --since '1 week ago' --oneline --author [email]
    graph = log --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset'
    hotfix = !sh ~/bin/hotfix.sh
    merge-hotfix = !sh ~/bin/merge-hotfix.sh
    merge-release = !sh ~/bin/merge-release.sh
    conflicts = diff --name-only --diff-filter=U
    latest = for-each-ref --sort=-committerdate --format='%(committerdate:short) %(refname:short) [%(committername)]'
    merge-release-major = merge-release-major.sh
    merge-release-minor = merge-release-minor.sh
    merge-release-patch = merge-release-patch.sh