]> Tony Duckles's Git Repositories (git.nynim.org) - dotfiles.git/blob - .gitconfig
.gitconfig: Maintain default `pull` behavior of ff-only
[dotfiles.git] / .gitconfig
1 [user]
2 name = Tony Duckles
3 email = tony@nynim.org
4
5 [alias]
6 # Simple aliases
7 ci = commit
8 st = status -sb
9 br = branch
10 co = checkout
11 tags = tag -n1 -l
12 # Log helpers
13 ll = log --pretty='format:%C(yellow)%h%Creset %s%C(green bold)%d%Creset %C(black bold)(by %an, %ar)%Creset'
14 graph = log --all --graph --topo-order --pretty='format:%C(yellow)%h%Creset %s %C(black bold)(by %an)%Creset%C(green bold)%d%Creset%n'
15 # Remote helpers
16 in = !git-incoming
17 out = !git-outgoing
18 # Branch helpers
19 bd = !git-branch-dates
20 bv = !git-branch-dates -v
21 cv = !git-cherry-view
22 # Diff helpers
23 df = diff
24 dfc = diff --cached
25 dfw = diff --word-diff=color
26 dfcw = diff --cached --word-diff=color
27 # Searching
28 ls = ls-files
29 ack = !git-ack
30 # Submodules
31 sub = !git-subup
32 sup = !git-subup pull
33 # Misc
34 root = rev-parse --show-toplevel
35 who = shortlog -s --
36 fp = format-patch --stdout
37 patch = !git --no-pager diff --no-color
38
39 [core]
40 filemode = true
41 logallrefupdates = true
42 whitespace = space-before-tab, trailing-space
43 excludesfile = ~/.gitfiles/gitignore-global
44 attributesfile = ~/.gitfiles/gitattributes-global
45 pager = diff-pager
46
47 [interactive]
48 diffFilter = diff-filter
49
50 [diff]
51 renames = copies
52 algorithm = patience
53
54 [sendemail]
55 smtpserver = smtp.gmail.com
56 smtpserverport = 587
57 smtpencryption = tls
58 smtpuser = tony@nynim.org
59
60 [color]
61 ui = auto
62
63 [color "diff"]
64 plain = 241
65 meta = blue bold
66 frag = magenta bold
67 old = red bold
68 new = green bold
69
70 [color "branch"]
71 current = yellow reverse
72 local = yellow bold
73 remote = green
74 plain = red bold
75
76 [color "decorate"]
77 branch = green bold
78 remoteBranch = green
79
80 [color "status"]
81 added = yellow
82 changed = green bold
83 untracked = blue bold
84
85 [color "diff-highlight"]
86 oldNormal = nobold
87 oldHighlight = red bold 235
88 newNormal = nobold
89 newHighlight = green bold black
90
91 [pull]
92 rebase = false
93 ff = only
94
95 [push]
96 default = matching
97
98 [include]
99 path = .gitconfig.local