]> git.wh0rd.org Git - home.git/blob - .gitconfig
gitconfig: use --ff with cp by default
[home.git] / .gitconfig
1 [user]
2         name = Mike Frysinger
3         email = vapier@gentoo.org
4 [color]
5         ui = auto
6         diff = auto
7         status = auto
8 [color "diff"]
9         old = red bold
10         new = green bold
11         plain = blue bold
12         frag = yellow bold
13         whitespace = normal green
14         meta = magenta
15 [push]
16         default = current
17 [alias]
18         a    = add
19         ab   = abandon
20         ar   = archive
21         b    = branch -v
22         bi   = bisect
23         cfg  = config
24         ci   = commit
25         co   = checkout
26         cp   = cherry-pick --ff
27         d    = diff
28         desc = describe
29         dl   = download
30         f    = fetch
31         fp   = format-patch -C -M
32         g    = grep
33         h    = help
34         l    = log
35         m    = merge
36         rb   = rebase --committer-date-is-author-date
37         rb-a = rebase --abort
38         rb-c = rebase --continue
39         rb-i = rebase --interactive
40         rb-s = rebase --skip
41         rl   = rev-list
42         se   = send-email -C -M
43         sm   = submodule
44         st   = status
45         t    = tag
46         up   = upload
47 [merge]
48         conflictstyle = diff3
49 [rebase]
50         autosquash = true
51 [sendemail]
52         chainreplyto = false
53         confirm = always
54         suppressfrom = true
55         smtpserver = localhost:1111