]> Tony Duckles's Git Repositories (git.nynim.org) - dotfiles.git/blob - .gitconfig
.gitconfig: Use --word-diff=color for 'git diff --word-diff'
[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 --color -vv
21 cv = !git-cherry-view
22 # Diff helpers
23 df = diff --patience
24 dfc = diff --patience --cached
25 dfw = diff --patience --word-diff=color
26 dfcw = diff --patience --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
38 [core]
39 filemode = true
40 logallrefupdates = true
41 whitespace = space-before-tab, trailing-space
42 excludesfile = ~/.gitignore_global
43
44 [diff]
45 renames = copies
46
47 [sendemail]
48 smtpserver = smtp.gmail.com
49 smtpserverport = 587
50 smtpencryption = tls
51 smtpuser = tony@nynim.org
52
53 [color]
54 ui = auto
55
56 [color "diff"]
57 meta = blue bold
58 frag = magenta bold
59 old = red bold
60 new = green bold
61
62 [color "branch"]
63 current = yellow reverse
64 local = yellow bold
65 remote = green
66 plain = red bold
67
68 [color "decorate"]
69 branch = green bold
70 remoteBranch = green
71
72 [color "status"]
73 added = yellow
74 changed = green bold
75 untracked = blue bold
76
77 [push]
78 default = matching