-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgitconfig
More file actions
70 lines (58 loc) · 1.34 KB
/
Copy pathgitconfig
File metadata and controls
70 lines (58 loc) · 1.34 KB
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
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
[alias]
br = branch
ca = commit -a
ci = commit
cm = commit --amend
co = checkout
dc = diff --cached
dnw = diff --word-diff-regex=[^[:space:]]
dt = difftool -g
fa = fetch --all
ff = merge --ff-only @{u}
fp = push --force-with-lease
last = log -n 5 --pretty='format:%h %an <%aE> %aI %s'
lb = log --graph --simplify-by-decoration --pretty=format:'%d' --all
lol = log --graph --decorate --pretty=oneline --abbrev-commit
mr = !sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -
nb = checkout -b
noff = merge --no-ff
po = push origin
pom = push origin master
pt = push origin --tags
pullff = pull --ff-only
pullsm = submodule update --recursive --remote
rb = rebase
st = status
[apply]
whitespace=fix
[branch]
autosetuprebase = always
[color]
ui = auto
[core]
editor = nvim
logallrefupdates = true
whitespace = -indent-with-non-tab, trailing-space, -cr-at-eol, space-before-tab
[credential]
helper = libsecret
[diff]
algorithm = patience
compactionHeuristic = true
guitool = meld
renames = 5
tool = vimdiff
[github]
user = ivajloip
[merge]
ff = only
guitool = meld
tool = vimdiff
[mergetool]
# No *.orig files left when using mergetool.
keepBackup = false
prompt = false
[push]
default = current
[user]
email = ivajloip@gmail.com
name = Ivaylo Petrov