diff --git a/.gitconfig b/.gitconfig index 3a52974..bebeded 100644 --- a/.gitconfig +++ b/.gitconfig @@ -12,11 +12,11 @@ aacm = !git add -A . && git commit -m amend = !git add -A && git commit --amend --no-edit amendm = commit --amend -m - br = branch + brv = branch -v + brr = branch -r + br = branch brd = branch -d brD = branch -D - brv = branch -v - brr = branch -r b = "!git for-each-ref --sort='-authordate' --format='%(authordate)%09%(objectname:short)%09%(refname)' refs/heads | sed -e 's-refs/heads/--'" ca = commit -a --verbose co = checkout @@ -27,21 +27,21 @@ cam = commit -a -v cm = commit -m d = diff - ds = diff --stat - dc = diff --cached + ds = diff --stat + dc = diff --cached dmerged = "git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d" - dev = !git checkout dev && git pull origin dev - f = "!git ls-files | grep -i" - gr = grep -Ii - ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate + dev = !git checkout dev && git pull origin dev + f = "!git ls-files | grep -i" + gr = grep -Ii + ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat la = "!git config -l | grep alias | cut -c 7-" lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit -- - merged = branch --merged - master = !git checkout master && git pull origin + merged = branch --merged + master = !git checkout master && git pull origin m = commit --amend --verbose - new = !sh -c 'git log $1@{1}..$1@{0} "$@"' - pu = !git push origin $(git rev-parse --abbrev-ref HEAD) + new = !sh -c 'git log $1@{1}..$1@{0} "$@"' + pu = !git push origin $(git rev-parse --abbrev-ref HEAD) po = push origin pod = push origin dev pos = push origin staging @@ -58,16 +58,12 @@ rall = ls-remote --heads rh = reset --hard #remote pointing to your colleagues forks - ra = "!f() { \ - git remote add $1 https://bitbucket.org/$2.git; \ - }; f" + ra = "!f() { git remote add $1 https://bitbucket.org/$2.git; }; f" staging = !git checkout staging && git pull origin staging sortdiff = !sh -c 'git diff "$@" | grep "^[+-]" | sort --key=1.2 | uniq -u -s1' st = status #Add a subtree to your git project - sba = "!f() { \ - git subtree add --prefix $2 $1 master --squash; \ - }; f" + sba = "!f() { git subtree add --prefix $2 $1 master --squash; }; f" t = tag -l unstage = reset HEAD uncommit = reset --soft HEAD^