[user]
- name = James Bunton
- email = jamesbunton@delx.net.au
+ name = James Bunton
+ email = jamesbunton@delx.net.au
[color]
- ui = always
+ ui = auto
[core]
- pager = less -+F -+X
- editor = vim
+ pager = less -+F -+X
+ editor = vim
[log]
- decorate = full
+ decorate = full
[diff]
- renamelimit = 10000
+ renamelimit = 10000
+ renames=copies
[push]
- # Set to tracking instead of upstream for backwards compatibility
- default = tracking
+ # Set to tracking instead of upstream for backwards compatibility
+ default = tracking
[alias]
- graphlog = log --graph --pretty=format:'%C(bold black)%h%Creset %C(bold red)%ad %C(bold blue)%s%Creset %C(bold yellow)%d%Creset %C(bold black)<%an>%Creset' --date=short
- ci = commit
- co = checkout
- st = status
- di = diff
- diw = diff --color-words
- dic = diff --cached
- dicw = diff --cached --color-words
- ff = merge --ff-only
- ffpull = pull --ff-only
- lso = ls-files -X .gitignore -o
- newpush = !git push -u origin "$(git rev-parse --abbrev-ref HEAD)"
+ graphlog = log --graph --pretty=format:'%C(bold black)%h%Creset %C(bold red)%ad %C(bold blue)%s%Creset %C(bold yellow)%d%Creset %C(bold black)<%an>%Creset' --date=short
+ ci = commit
+ co = checkout
+ st = status
+ di = diff
+ diw = diff --color-words
+ dic = diff --cached
+ dicw = diff --cached --color-words
+ ff = merge --ff-only
+ ffpull = pull --ff-only
+ lso = ls-files -X .gitignore -o
+ pushn = !git push origin --set-upstream "$(git rev-parse --abbrev-ref HEAD)"
+ pushd = !git push origin --delete "$(git rev-parse --abbrev-ref HEAD)"
+ cherry-pick = cherry-pick -x
+ branches-to-kill = !git branch --merged origin/master|grep -v master|xargs -n1 echo git branch -d
+ mergediff = !git checkout --quiet --detach HEAD && git merge --no-edit origin/master && git diff -C10 -M10 origin/master && git checkout --quiet -