]> git.wh0rd.org - home.git/blame_incremental - .gitconfig
gitconfig: add merge-changelog driver
[home.git] / .gitconfig
... / ...
CommitLineData
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 cp-a = cherry-pick --abort
28 cp-c = cherry-pick --continue
29 cp-x = cherry-pick -x
30 d = diff
31 desc = describe
32 dl = download
33 f = fetch
34 fp = format-patch -C -M
35 g = grep
36 h = help
37 l = log
38 m = merge
39 rb = rebase --committer-date-is-author-date
40 rb-a = rebase --abort
41 rb-c = rebase --continue
42 rb-i = rebase --interactive
43 rb-s = rebase --skip
44 rl = rev-list
45 se = send-email -C -M
46 sm = submodule
47 st = status
48 t = tag
49 up = upload
50[merge]
51 conflictstyle = diff3
52[rebase]
53 autosquash = true
54[merge "merge-changelog"]
55 name = GNU-style ChangeLog merge driver
56 driver = /usr/bin/git-merge-changelog %O %A %B
57[sendemail]
58 chainreplyto = false
59 confirm = always
60 suppressfrom = true
61 smtpserver = localhost:1111