Skip to content

Commit 5a10749

Browse files
committed
git: Add gitconfig and gitignore
1 parent 173b731 commit 5a10749

File tree

2 files changed

+98
-0
lines changed

2 files changed

+98
-0
lines changed

gitconfig

+89
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
[user]
2+
3+
name = Dov Murik
4+
5+
[core]
6+
excludesfile = ~/.gitignore
7+
whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
8+
pager="less -+$LESS -FRX"
9+
10+
[color]
11+
ui = true
12+
#local = yellow
13+
#remote = green
14+
15+
[color "diff"]
16+
meta = 11
17+
commit = yellow bold
18+
frag = magenta bold
19+
old = red bold
20+
new = green bold
21+
# Highlight whitespace in diffs
22+
whitespace = red reverse
23+
24+
[color "diff-highlight"]
25+
oldNormal = red bold
26+
oldHighlight = red bold 52
27+
newNormal = green bold
28+
newHighlight = green bold 22
29+
30+
[color "status"]
31+
added = yellow
32+
changed = green
33+
untracked = cyan
34+
35+
[alias]
36+
st = status
37+
ci = commit
38+
br = branch -vv
39+
co = checkout
40+
df = diff
41+
dft = difftool
42+
difft = difftool
43+
root = rev-parse --show-toplevel
44+
ff = merge --ff-only
45+
fap = fetch --all --prune
46+
unmerged = branch -a --no-merged
47+
lg = log --graph --pretty=format:'%C(auto)%h%d %s (%ar) <%an>'
48+
publish = !/usr/bin/git-publish
49+
pp = push -u origin HEAD
50+
51+
[merge]
52+
conflictstyle = diff3
53+
54+
[pull]
55+
ff = only
56+
57+
[push]
58+
default = simple
59+
60+
[diff]
61+
algorithm = patience
62+
renames = copies
63+
colorMoved = default
64+
tool = difftastic
65+
66+
[difftool]
67+
prompt = false
68+
69+
[difftool "difftastic"]
70+
cmd = difft "$LOCAL" "$REMOTE"
71+
72+
[pager]
73+
difftool = true
74+
75+
[rerere]
76+
enabled = true
77+
78+
[transfer]
79+
fsckobjects = true
80+
81+
[sendemail]
82+
aliasesFile = ~/.mutt/aliases
83+
aliasFileType = mutt
84+
85+
[filter "lfs"]
86+
smudge = git-lfs smudge -- %f
87+
process = git-lfs filter-process
88+
required = true
89+
clean = git-lfs clean -- %f

gitignore

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
TAGS
2+
\#*\#
3+
*.swp
4+
*.o
5+
*.lo
6+
*.la
7+
.deps/
8+
.libs/
9+
.DS_Store

0 commit comments

Comments
 (0)