blob: d68efc810c5711d309b7e34324053d7355bd4a37 (
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
25
26
27
28
29
30
31
32
|
[user]
name = Egor Tensin
email = Egor.Tensin@gmail.com
[core]
editor = vim
autocrlf = input
[push]
default = current
[merge]
tool = kdiff3
[mergetool "kdiff3"]
keepBackup = false
trustExitCode = false
[diff]
tool = kdiff3
[difftool "kdiff3"]
keepBackup = false
trustExitCode = false
[pull]
ff = only
[alias]
clean-all = clean -fdx
clean-ignored = clean -fdX
clean-unknown = clean -fd
l = log --oneline
# This is awesome: http://stackoverflow.com/a/1838938/514684
ll = log --graph --full-history --all --pretty=format:"%h%x09%d%x20%s"
lll = log --graph --full-history --all --color --pretty=tformat:"%x1b[31m%h%x09%x1b[32m%d%x1b[0m%x20%s%x20%x1b[33m(%an)%x1b[0m"
wdiff = diff --word-diff
xx = update-index --add --chmod=+x
[fetch]
prune = true
|
