7 |
7 |
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 record = !sh -c '(git add -p -- $@ && git commit -v ) || git reset' -- |
13 rec = !sh -c '(git add -p -- $@ && git commit -v ) || git reset' -- |
14 update = !git fetch --all --tags --prune && git pull --rebase |
14 unrec = checkout --patch |
15 incoming = "!git remote update -p; git log ..@{u}" |
15 update = "!git remote update -p && git merge --ff-only --stat @{u}" |
16 outgoing = log @{u}.. |
16 in = "!git remote update -p; git log ..@{u}" |
17 glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative |
17 out = log @{u}.. |
18 cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d" |
18 cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d" |
19 ctags = !~/.git_helpers/ctags |
19 ctags = "!~/.git_helpers/ctags" |
|
20 glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative |
|
21 recent = for-each-ref --count=20 --sort=-committerdate --format='%(committerdate:short) %(refname:short)' |
20 |
22 |
21 [branch] |
23 [branch] |
22 autosetuprebase = always |
24 autosetuprebase = always |
23 autosetupmerge = always |
25 autosetupmerge = always |
24 |
26 |
25 [push] |
27 [push] |
26 default = simple |
28 default = current |
27 |
29 |
28 [rebase] |
30 [rebase] |
29 stat = true |
31 stat = true |
30 |
32 |
31 # include.path is available in git 1.7.10 and later |
33 # include.path is available in git 1.7.10 and later |