]> git.rmz.io Git - dotfiles.git/blob - git/config
git: interactive rebase when pulling, except master/develop
[dotfiles.git] / git / config
1 [user]
2 name = Samir Benmendil
3 email = me@rmz.io
4 [color]
5 branch = auto
6 status = auto
7 ui = auto
8 diff = auto
9 [push]
10 default = simple
11 [diff]
12 tool = vimdiff
13 [color "diff"]
14 new = cyan bold
15 old = red bold
16 meta = green
17 [sendemail]
18 smtpencryption = tls
19 smtpserver = smtp.gmail.com
20 smtpuser = samir.benmendil@gmail.com
21 smtpserverport = 587
22 [mergetool "fugitive"]
23 cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
24 [merge]
25 tool = fugitive
26 defaultToUpstream = true
27 [mergetool]
28 prompt = no
29 [rebase]
30 autostash = true
31 autosquash = true
32 [status]
33 submodulesummary = true
34 [rerere]
35 enabled = true
36 [pull]
37 rebase = interactive
38 [branch "master"]
39 rebase = preserve
40 [branch "develop"]
41 rebase = preserve