]> git.rmz.io Git - dotfiles.git/blob - git/config
git: use diff3 for conflictstyle
[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 = current
11 recurseSubmodules = check
12 [diff]
13 tool = vimdiff
14 [color "diff"]
15 new = cyan bold
16 old = red bold
17 meta = green
18 [sendemail]
19 smtpencryption = tls
20 smtpserver = /usr/bin/msmtp
21 smtpuser =
22 [mergetool "fugitive"]
23 cmd = vim -f -c \"Gdiffsplit!\" \"$MERGED\"
24 [merge]
25 tool = fugitive
26 defaultToUpstream = true
27 conflictstyle = diff3
28 [mergetool]
29 prompt = no
30 [rebase]
31 autostash = true
32 autosquash = true
33 [status]
34 submodulesummary = true
35 [rerere]
36 enabled = true
37 [pull]
38 rebase = interactive
39 [branch "master"]
40 rebase = merges
41 [branch "develop"]
42 rebase = merges
43 [commit]
44 verbose = true
45 [alias]
46 remote-to-ssh = "!f(){ local r=$1; git remote set-url $r $(git remote get-url $r | sed -r 's,https?://([^/]+),git@\\1:,'); };f"
47 clean-orig = "!git ls-files -o --exclude-standard | grep '\\.orig$' | xargs -n100 -p rm"
48 [filter "lfs"]
49 clean = git-lfs clean -- %f
50 smudge = git-lfs smudge -- %f
51 process = git-lfs filter-process
52 required = true
53
54 [includeIf "gitdir:~/src/fpp/**"]
55 path = ~/.config/git/fpp.config