dotfiles/.gitconfig at master · jeffgodwyll/dotfiles · GitHub

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
[github]
    user = jeffgodwyll

[user]
	name = Jeffrey Godwyll
	email = jeffgodwyll@gmail.com

[alias]
    # I let antigen take care of aliases
    # Plus what i feel is better
    a = add
    aa = add --all
    c = commit
    co = checkout
    df = diff
    p = pull
    rb = rebase
    rba = rebase --abort
    rbc = rebase --continue
    rbi = rebase --interactive
    rbs = rebase --skip
    fix = rebase -i HEAD^^
    s = status
    st = status -sb
    unstage = reset HEAD

[core]
	editor = vim
	excludesfile = /Users/jeff/.gitignore_global

[push]
	default = simple

[diff]
    tool = vimdiff

[merge]
	tool = vimdiff
	conflictstyle = diff3

[mergetool]
	prompt = false
[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
[commit]
	template = /Users/jeff/.stCommitMsg
[filter "lfs"]
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process
	required = true
[credential "https://source.developers.google.com"]
	helper = gcloud.sh