-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
69 lines (67 loc) · 1.69 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
[user]
name = Francesco Mosca
email = f.mosca@dnsee.com
[color]
diff = auto
status = auto
branch = auto
ui = 1
[giggle]
main-window-maximized = true
main-window-geometry = 0x0+0+0
main-window-view = HistoryView
history-view-vpane-position = 580
[alias]
conflicts = diff --name-only --diff-filter=U
amend = commit --amend -C HEAD
meld = !/opt/git-meld/git-meld.pl
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
ss = status -s
co = checkout
ctags = !.git/hooks/ctags
bb = for-each-ref --sort=committerdate refs/heads/ --format="%(authordate:short)%09%(objectname:short)%09%1B[0;33m%(refname:short)%1B[m%09(%(authorname))"
[core]
excludesfile = /Users/fra/.gitignore
quotepath = false
editor = vim
precomposeunicode = true
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[branch "master"]
rebase = false
[rebase]
stat = true
[branch "develop"]
rebase = false
[init]
templatedir = ~/.git_template
[merge]
tool = meld
[push]
default = simple
[color]
ui = always
[color "diff"]
meta = yellow
commit = green
frag = magenta
old = red
new = green
whitespace = red reverse
[color "diff-highlight"]
oldNormal = red
oldHighlight = "red 52"
newNormal = "green"
newHighlight = "green 22"
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "status"]
added = yellow
changed = green
untracked = cyan