-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
36 lines (36 loc) · 874 Bytes
/
.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
[user]
name = Friedjoff Trautwein
email = [email protected]
[branch]
autosetuprebase = always
[color]
ui = auto
[help]
autocorrect = 1
[alias]
co = checkout
cm = commit
# Show verbose output about tags, branches or remotes
tags = tag -l
branches = branch -a
remotes = remote -v
[core]
excludesfile = ~/.gitignore_global
[fetch]
# Removes branches locally when you do a git pull/fetch if the branches was deleted on the remote.
prune = true
[push]
default = simple
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true
[merge]
tool = Kaleidoscope
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[mergetool]
prompt = false
[diff]
tool = Kaleidoscope