.gitconfig

changeset 207
af14b7f5bc42
parent 197
85a414f67356
child 212
36642e1d867a
equal deleted inserted replaced
206:0f6e9962f2b4 207:af14b7f5bc42
8 [core] 8 [core]
9 pager = LESS='FSRX' less 9 pager = LESS='FSRX' less
10 10
11 [alias] 11 [alias]
12 ci = commit 12 ci = commit
13 rec = !sh -c '(git add -p -- $@ && git commit -v ) || git reset' -- 13 rec = commit -p
14 unrec = checkout --patch 14 unrec = checkout --patch
15 sb = status -sb 15 st = status -sb
16 co = checkout
17 br = branch
18 staged = diff --cached
19 unstage = reset HEAD --
16 update = "!git remote update -p && git merge --ff-only --stat @{u}" 20 update = "!git remote update -p && git merge --ff-only --stat @{u}"
17 in = "!git remote update -p; git log ..@{u}" 21 in = "!git remote update -p; git log ..@{u}"
18 out = log @{u}.. 22 out = log @{u}..
23 new = !sh -c 'git log $1@{1}..$1@{0}' "$@"
19 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"
20 ctags = "!~/.git_helpers/ctags" 25 ctags = "!~/.git_helpers/ctags"
21 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=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
22 recent = for-each-ref --count=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' "$@"
23 29
24 [branch] 30 [branch]
25 autosetuprebase = always 31 autosetuprebase = always
26 autosetupmerge = always 32 autosetupmerge = always
27 33

mercurial