aboutsummaryrefslogtreecommitdiff
path: root/files/.gitconfig
blob: 100be4fc4aa9239fa23aa223bad97dd310b4c983 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
[user]
    name = Anton Bobov
    email = abobov@gmail.com
[color]
    ui = auto
[diff]
    tool = vimdiff
[difftool]
    prompt = false
[merge]
    tool = vimdiff
    stat = true
[core]
    pager = less -+$LESS -FRX
[alias]
    diffstat = diff --stat -r
    co = checkout
    lg = log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
    st = status
    k =  !sh -c 'gitk $1' -
    ka = !sh -c 'gitk --all' -
    kb = !sh -c 'gitk --branches' -
    fix = commit --amend -C HEAD
    integrate = !sh -c 'git rebase master $1 && git checkout master && git merge --ff $1' -