-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
86 lines (84 loc) · 2.38 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
[user]
email = johan.bjorklund@proton.me
name = Johan Björklund
[includeIf "gitdir:~/work/"]
path = .work.gitconfig
[core]
excludesfile = .gitignore_global
editor = vim
# Don't consider trailing space change as a cause for merge conflicts
whitespace = -trailing-space
autocrlf = input
[diff]
tool = vimdiff
[push]
default = simple
[status]
submoduleSummary = true
[diff]
# Display submodule-related information (commit listings)
submodule = log
[fetch]
# Auto-fetch submodule changes (won't auto-update)
recurseSubmodules = on-demand
[log]
# Use abbrev SHAs whenever possible/relevant instead of full 40 chars
abbrevCommit = true
# Automatically --follow when given a single path
follow = true
[merge]
# Display common-ancestor blocks in conflict hunks
conflictStyle = diff3
[mergetool]
# Clean up backup files created by merge tools on tool exit
keepBackup = false
# Clean up temp files created by merge tools on tool exit
keepTemporaries = false
# Put the temp files in a dedicated dir anyway
writeToTemp = true
# Auto-accept file prompts when launching merge tools
prompt = false
[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
[status]
# Display submodule rev change summaries in status
submoduleSummary = true
# Recursively traverse untracked directories to display all contents
showUntrackedFiles = all
[github]
user = JohanBjoerklund
[url "https://github.com/"]
insteadOf = gh:
[color]
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = green
changed = yellow
untracked = red
[alias]
st = status
co = checkout
unstage = reset HEAD --
lg = log --graph --date=relative --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ad)%Creset'
oops = commit --amend --no-edit
review-local = "!git lg @{push}.."
s = status -s
uncommit = reset HEAD^
[pull]
rebase = true
[rebase]
autostash = true
[checkout]
defaultRemote = origin