-
Notifications
You must be signed in to change notification settings - Fork 2
/
Copy path.gitconfig
46 lines (46 loc) · 1.13 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
[user]
name = Emmanuel
email = [email protected]
signingkey = DEAD4079848B519D
[core]
editor = code --wait
excludesfile = ~/.gitignore
autocrlf = input
# Don't consider trailing space change as a cause for merge conflicts
whitespace = -trailing-space
[commit]
gpgsign = true
[gpg]
program = gpg
[format]
signOff = true
[color]
branch = auto
diff = auto
interactive = auto
status = auto
[init]
defaultBranch = main
[web]
browser = google-chrome
[credential]
helper = osxkeychain
[pull]
rebase = merges
[push]
# Default push should only push the current branch to its push target, regardless of its remote name
default = upstream
# When pushing, also push tags whose commit-ishs are now reachable upstream
followTags = true
[merge]
tool = kdiff3
# Display common-ancestor blocks in conflict hunks
conflictStyle = diff3
# Disable fast-forward merges as default merge strategy.
ff = no
[difftool]
prompt = false
[alias]
d = diff
dc = diff --cached
l = log --graph --pretty=format:"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset" --abbrev-commit