-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgitconfig
More file actions
81 lines (79 loc) · 2.48 KB
/
gitconfig
File metadata and controls
81 lines (79 loc) · 2.48 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
71
72
73
74
75
76
77
78
79
80
81
[alias]
ci = commit
ca = commit --amend
co = checkout
graph = log --graph --decorate --oneline --branches
dfc = diff --cached --color --color-words
df = diff --color --color-words
# To use diff-so-fancy check https://github.com/so-fancy/diff-so-fancy
dfsc = !git diff --cached --color | diff-so-fancy | less --tabs=4 -RFX
dfs = !git diff --color | diff-so-fancy | less --tabs=4 -RFX
unstage = reset HEAD --
last = log -1 HEAD
s = status
amend = commit --amend
aa = add --all
ff = merge --ff-only
pullff = pull --ff-only
prb = pull --rebase
noff = merge --no-ff
fa = fetch --all
pom = push origin master
b = branch
ds = diff --stat=160,120
dh1 = diff HEAD~1
brs = for-each-ref --sort='-authordate:iso8601' --format=' %(color:green)%(authordate:iso8601)%09%(color:white)%(refname:short)' refs/heads
# Fancy logging.
# h = head
# hp = head with patch
# r = recent commits, only current branch
# ra = recent commits, all reachable refs
# l = all commits, only current branch
# la = all commits, all reachable refs
head = !git l -1
h = !git head
hp = "!. ~/.githelpers && show_git_head"
r = !git l -30
ra = !git r --all
l = "!. ~/.githelpers && pretty_git_log"
la = !git l --all
rms = "!f(){ git rm --cached \"$1\";rm -r \"$1\";git config -f .gitmodules --remove-section \"submodule.$1\";git config -f .git/config --remove-section \"submodule.$1\";git add .gitmodules; }; f"
wip = for-each-ref --sort='authordate:iso8601' --format=' %(color:green)%(authordate:relative)%09%(color:white)%(refname:short)' refs/heads
[color]
ui = always
[core]
editor = vim --noplugin
excludesfile = ~/.gitignore_global
autocrlf = input
# To use the delta pager check https://github.com/dandavison/delta
pager = delta
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections
dark = false # or light = true, or omit for auto-detection
[diff]
tool = vimdiff
[merge]
ff = only
tool = zdiff3
[user]
name = Yavor Atov
email = yavor.atov@gmail.com
[push]
default = current
[help]
autocorrect = 1
[mergetool "diffconflicts"]
cmd = diffconflicts vim $BASE $LOCAL $REMOTE $MERGED
trustExitCode = true
keepBackup = false
[http]
sslVerify = false
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[commit]
template = ~/.git-commit-template