-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgitconfig
More file actions
119 lines (99 loc) · 2.41 KB
/
gitconfig
File metadata and controls
119 lines (99 loc) · 2.41 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
[merge]
conflictstyle = diff3
[core]
excludesFile = ~/.gitignore
editor = code --wait
whitespace = trailing-space,space-before-tab
pager = delta
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true
line-numbers = true
side-by-side = true
[alias]
aa = add --all
amend = commit --amend
b = branch
br = branch
ci = commit
co = checkout
dc = diff --cached
dh1 = diff HEAD~1
diff = diff --word-diff
div = divergence
ds = diff --stat=160,120
fa = fetch --all
ff = merge --ff-only
gn = goodness
gnc = goodness --cached
h = !git head
head = !git l -1
hp = "!source ~/.githelpers && show_git_head"
l = "!source ~/.githelpers && pretty_git_log"
la = !git l --all
lol = log --pretty=oneline --abbrev-commit --graph --decorate
noff = merge --no-ff
pom = push origin master
pullff = pull --ff-only
r = !git l -20
ra = !git r --all
st = status
undo-commit = reset --soft HEAD^
up = "!git pull --rebase --prune $@"
cleanup = "!git fetch -p && for branch in $(git branch -vv | grep ': gone]' | awk '{print $1}'); do git branch -D $branch; done"
pushfwl = push --force-with-lease
recent = branch --sort=-committerdate --format=\"%(committerdate:relative)%09%(refname:short)\"
[color]
ui = auto
status = auto
branch = auto
diff = auto
[user]
name = Istvan Hoka
email = istvan.hoka@gmail.com
signingkey = /Users/ihoka/.ssh/1password.pub
[apply]
whitespace = nowarn
[github]
user = ihoka
[apply]
whitespace = nowarn
[push]
default = simple
[branch]
autosetupmerge = true
autosetuprebase = always
[gist]
private = yes
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
trustExitCode = true
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
[commit]
template = $HOME/.stCommitMsg
gpgsign = true
[init]
defaultBranch = main
[credential]
helper = osxkeychain
[difftool]
# Run the difftool immediately, don't ask 'are you sure' each time.
prompt = false
[pager]
# Use a pager if the difftool output is larger than one screenful,
# consistent with the behaviour of `git diff`.
difftool = true
[diff]
# Set difftastic as the default difftool, so we don't need to specify
# `-t difftastic` every time.
tool = difftastic
[gpg]
format = ssh
[gpg "ssh"]
program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign