-
Notifications
You must be signed in to change notification settings - Fork 1
/
gitconfig
111 lines (109 loc) · 3.32 KB
/
gitconfig
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
[user]
name = Ido Kanner
email = [email protected]
[init]
defaultBranch = main
[core]
editor = nvim
excludesfile = /home/ik/.gitignore
# pager = less -x2 -R
quotepath = false
precomposeunicode = true
logAllRefUpdates = true
; pager = diff-so-fancy | less --tabs=4 -RFX
pager = delta
autocrlf = input
[pull]
rebase = false
[color]
branch = auto
diff = auto
interactive = auto
status = auto
ui = auto
diff = auto
grep = auto
[interactive]
diffFilter = delta --color-only
[merge]
conflictstyle = diff3
# ff = false
# tool = vimdiff
[alias]
st = status -sb
ci = commit
br = branch -av
co = checkout
di = diff
df = diff --color
dic = diff --cached
lol = log --graph --decorate --pretty=oneline --abbrev-commit
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
lg = log -p --color
who = shortlog -s --
lp = log --graph --pretty=format:'%Cred%h%Creset — %s %Cgreen(%cr)%Creset %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --color
opps = reset --hard
ls = ls-files
lsi = ls-files -o -i --exclude-standard # show ignored ignored
ll = log --oneline
last = log -1 HEAD --stat
up = !git pull --rebase --prune $@ && git submodule update --init --recursive
bclean = "!f() { git branch --merged ${1-master} | grep -v " ${1-master}$" | xargs git branch -d; }; f"
bdone = "!f() { git checkout ${1-master} && git up && git bclean ${1-master}; }; f"
currentrev = "!f() { rev=$(git rev-parse HEAD); echo ${rev:0:7}; }; f"
pl = pull --rebase
plas = pull --rebase --autostash
st = status -v -u --column --show-stash
ai = add -i
# Show all of my configured aliases
aliases = !git config --list | grep 'alias\\.' | sed 's/alias\\.\\([^=]*\\)=\\(.*\\)/\\1\\ \t => \\2/' | sort
# For when you made that commit a bit too early, amend
amend = !git log -n 1 --pretty=tformat:%s%n%n%b | git commit -F - --amend
# Which files are receiving the most "love"
churn = !git log --all -M -C --name-only --format='format:' "$@" | sort | grep -v '^$' | uniq -c | sort | awk 'BEGIN {print "count,file"} {print $1 "," $2}'
# Update all submodules
subup = submodule update --init
cm = commit -m
search = !git rev-list --all | xargs git grep -i -n -F
regexp = !git rev-list --all | xargs git grep -i -n -P
count = git rev-list --count
cleanup = git gc --prune=now --aggressive
ver = describe --always --tags --dirty
[push]
default = matching
[http "https://gopkg.in"]
followRedirects = true
[url "[email protected]:"]
insteadOf = https://github.com:443/
[url "ssh://[email protected]/"]
insteadOf = https://bitbucket.org/
[help]
autocorrect = 10
[web]
browser = firefox
[rerere]
enabled = 1
autoupdate = 1
[diff]
colorMoved = default
[difftool]
prompt = true
[mergetool "vimdiff"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[mergetool "meld"]
trustExitCode = true
cmd = open -W -a Meld --args --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output=\"$MERGED\"
[delta]
navigate = true # use n and N to move between diff sections
side-by-side = true
line-numbers = true
[transfer]
fsckobjects = true
[fetch]
fsckobjects = false
[receive]
fsckobjects = true
[protocol]
version = 2
[safe]
directory = /opt/flutter