-
Notifications
You must be signed in to change notification settings - Fork 1
Expand file tree
/
Copy path.gitconfig
More file actions
139 lines (117 loc) · 3.73 KB
/
Copy path.gitconfig
File metadata and controls
139 lines (117 loc) · 3.73 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
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
[user]
name = Eugene Mihailenco
email = emi@trackman.com
#email = emihailenco@protonmail.com
[alias]
co = checkout
ci = commit
st = status --column
br = branch
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
type = cat-file -t
dump = cat-file -p
aa = add --all
dc = diff --cached
di = diff
amend = commit --amend
pr = pull --rebase
ff = merge --ff-only
pullff = pull --ff-only
noff = merge --no-ff
fa = fetch --all
pom = push origin master
ds = diff --stat=160,120
dh1 = diff HEAD~1
# Divergence (commits we added and commits remote added)
div = divergence
# Goodness (summary of diff lines added/removed/total)
gn = goodness
gnc = goodness --cached
# 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
hp = "!. ~/bin/githelpers && show_git_head"
h = !git head
head = !git l -1
la = !git l --all
l = "!. ~/bin/githelpers && pretty_git_log"
r = !GIT_NO_PAGER=1 git l -30
ra = !git r --all
b = "!. ~/bin/githelpers && pretty_git_branch"
bs = "!. ~/bin/githelpers && pretty_git_branch_sorted"
this = !git init && git add . && git commit -m \"initial commit\"
alias = !git config --list | grep -E 'alias\\.' | sed -E 's/alias\\.([^=]*)=(.*)/\\1 => \\2/' | sort
# Take a snapshot of your current working tree without removing
# the changes from your tree.
snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
# Easy merging, pick a file(s) from the current branch or
# the merged branch respectively:
ours = "!f() { git checkout --ours $@ && git add $@; }; f"
theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
bra = "!f() { git for-each-ref --sort=committerdate --format='%(refname:short) * %(authorname) * %(committerdate:relative)' refs/remotes/ | column -t -s '*'; }; f"
cleanup = "!f() { git reset HEAD --hard && git clean -dfx ; }; f"
# Find todos in repo code.
todo = grep --heading --break --ignore-case -e ' FIX: *' -e ' TODO: *'
# Just another one pretty-print
wow = log --all --graph --decorate --oneline --simplify-by-decoration
[color]
ui = true
[push]
default = matching
[merge]
tool = vimdiff
[mergetool]
prompt = true
[mergetool "vimdiff"]
cmd = "nvim -d \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\" -c '$wincmd w' -c 'wincmd J'"
[diff]
tool = nvimdiff
[difftool]
prompt = false
[difftool "nvimdiff"]
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
[difftool "hexdiff"]
cmd = "radiff2 \"$LOCAL\" \"$REMOTE\""
[difftool "dhex"]
cmd = "dhex \"$LOCAL\" \"$REMOTE\""
# Unity yaml merging when conflicts in prefabs happen
#[merge]
# tool = unityyamlmerge
#
#[mergetool "unityyamlmerge"]
# trustExitCode = false
# cmd = /home/randy/Unity/Hub/Editor/2020.3.7f1/Editor/Data/Tools/UnityYAMLMerge merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
# Binary files diff with hexdump
# [diff "hex"]
# textconv = hexdump -n 1024 -v -C
# binary = true
# Setting up LFS
[http]
sslVerify = false
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
[credential]
helper = libsecret
[lfs]
batch = true
concurrenttransfers = 40
[pull]
rebase = false
[core]
pager = delta
[interactive]
diffFilter = delta --color-only
[delta]
features = side-by-side line-numbers decorations
whitespace-error-style = 22 reverse
[delta "decorations"]
commit-decoration-style = bold yellow box ul
file-style = bold yellow ul
file-decoration-style = none