-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
111 lines (95 loc) · 2.67 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
[alias]
# View the SHA, description, and history graph
#l = log --graph --pretty "%C(yellow)%h%C(cyan)%x20%Creset%aE%x20%x28%ar%x29%n%C(white)%s%n"
l = log --graph --all --pretty=format:"'%C(yellow)%h %C(blue)%s%C(auto)%w(0,0,7)%+d%n %an(%ar) %C(cyan)%ae%n'"
# Shorten status
s = status
# Shorten commit
c = commit
# Pull in remote changes for the current repository and all its submodules
p = !"git pull; git submodule foreach git pull origin master"
# Diff
d = difftool
# Undo a `git push`
undopush = push -f origin HEAD^:master
lu = ls-files --others --exclude-standard
# Show verbose output about tags, branches or remotes
tags = tag -l
branches = branch -a
remotes = remote -v
file-size-diff = !~/Code/ksmandersen/dotfiles/bin/git-file-size-diff.sh
pushall = !git remote | xargs -L1 git push --all
# push current branch
pc = push -u origin HEAD
[apply]
whitespace = nowarn
# Detect whitespace errors when applying a patch
# whitespace = fix
[core]
# Use custom `.gitignore` and `.gitattributes`
excludesfile = /Users/ksmandersen/.gitignore_global
attributesfile = ~/.gitattributes
editor = vim
# Treat spaces before tabs, lines that are indented with 8 or more spaces, and all kinds of trailing whitespace as an error
# whitespace = space-before-tab,indent-with-non-tab,trailing-space
[color]
# Use colors in Git commands that are capable of colored output when outputting to the terminal
ui = auto
branch = auto
diff = auto
status = 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 = yellow
changed = green
untracked = cyan
[branch "master"]
# Use `origin` as the default remote on the `master` branch in all cases
remote = origin
merge = refs/heads/master
[user]
email = hello@kristian.co
name = Kristian Andersen
username = ksmandersen
signingkey = 748F21A4
[push]
default = matching
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool]
keepBackup = true
[credential]
helper = osxkeychain
[hub]
protocol = git
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[commit]
gpgsign = true
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[github]
user = ksmandersen
[gpg]
program = /opt/homebrew/bin/gpg
[pull]
rebase = false
[init]
defaultBranch = master