comparison: .gitconfig
.gitconfig
- changeset 228
- bf3429214b78
- parent 212
- 36642e1d867a
- child 229
- 0aefc3566070
equal
deleted
inserted
replaced
| 227:230c3fc67325 | 228:bf3429214b78 |
|---|---|
| 16 co = checkout | 16 co = checkout |
| 17 br = branch | 17 br = branch |
| 18 staged = diff --cached | 18 staged = diff --cached |
| 19 unstage = reset HEAD -- | 19 unstage = reset HEAD -- |
| 20 update = "!git remote update -p && git merge --ff-only --stat @{u}" | 20 update = "!git remote update -p && git merge --ff-only --stat @{u}" |
| 21 in = "!git remote update -p; git log ..@{u}" | 21 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" |
| 22 out = "!git glog @{u}.." | 22 out = "!git log --pretty=onelinecustom @{u}.." |
| 23 new = !sh -c 'git log $1@{1}..$1@{0}' "$@" | 23 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}" |
| 24 cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d" | 24 cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d" |
| 25 ctags = "!~/.git_helpers/ctags" | 25 ctags = "!~/.git_helpers/ctags" |
| 26 glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative | 26 glog = log --graph --pretty=onelinecustom |
| 27 recent = !sh -c 'git for-each-ref --count=${1:-20} --sort=-committerdate --format=\"%(committerdate:short) %(refname:short)\"' "$@" | 27 recent = !sh -c 'git for-each-ref --count=${1:-20} --sort=-committerdate --format=\"%(committerdate:short) %(refname:short)\"' "$@" |
| 28 last = !sh -c 'git log -${1:-1} --stat' "$@" | 28 |
| 29 [pretty] | |
| 30 onelinecustom = format:%C(magenta)%h%Creset -%C(yellow)%d%Creset %s %C(green)(%cr)%Creset %C(cyan)<%an>%Creset | |
| 29 | 31 |
| 30 [branch] | 32 [branch] |
| 31 autosetuprebase = always | 33 autosetuprebase = always |
| 32 autosetupmerge = always | 34 autosetupmerge = always |
| 33 | 35 |
| 42 path = ~/.gitconfig.local | 44 path = ~/.gitconfig.local |
| 43 | 45 |
| 44 # https://github.com/aanand/git-up | 46 # https://github.com/aanand/git-up |
| 45 # $ gem install git-up | 47 # $ gem install git-up |
| 46 [git-up "rebase"] | 48 [git-up "rebase"] |
| 47 log-hook = "echo \"changes on $1 -> $2:\"; git --no-pager log --oneline --decorate $1..$2" | 49 log-hook = "echo \"changes on $1 -> $2:\"; git --no-pager log --pretty=onelinecustom $1..$2" |
| 48 | 50 |
| 51 # vim: noet:sw=8 |
