From: Jannik Zander <59698@grundfos.com> Date: Fri, 3 Aug 2018 17:23:35 +0000 (+0200) Subject: Update git config X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=9fb715eb722433e46989b07e54f209163405b83a;p=dotfiles.git Update git config --- diff --git a/.config/git/config b/.config/git/config index bddcd8f..2ff173c 100644 --- a/.config/git/config +++ b/.config/git/config @@ -35,6 +35,16 @@ smudge = git-lfs smudge %f required = true [alias] +# shortcuts + co = checkout + ci = commit + st = status + ls = ls-files + cl = clone --recurse-submodules -j8 + dt = difftool + mt = mergetool + + sb = status -sb a = add una = reset HEAD -- uha = checkout HEAD -- @@ -42,14 +52,10 @@ uhaa = reset --hard HEAD br = branch brdm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d" - co = checkout go = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f" - ci = commit amend = commit --amend unci = reset --soft HEAD~ diff = diff --word-diff - dt = difftool - mt = mergetool # dont pull without rebase, and dont push without pull (fetch & merge) p = pull --rebase pp = "!git pull --rebase && git push" @@ -58,7 +64,6 @@ cp = cherry-pick wc = whatchanged -p ch = cherry -v - s = status -sb fs = "!git fetch && git status" rb = rebase ec = config --global -e @@ -66,14 +71,12 @@ lg = log --pretty=format:"%C(yellow)%h\\ %C(green)%ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short --graph lol = log --oneline --decorate --graph --all --first-parent last = log -1 HEAD - ls = ls-files lt = tag -l type = cat-file -t dump = cat-file -p who = shortlog -s -- remotes = remote -v root = rev-parse --show-toplevel - cl = clone --recursive # Show the diff between the latest commit and the current state d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-stat"