update of git configs

This commit is contained in:
Tobias Schmidl 2016-12-07 17:01:55 +01:00
parent 34e162f851
commit c658f89b56
4 changed files with 52 additions and 41 deletions

View file

@ -1,3 +1,5 @@
#! /bin/sh #! /bin/sh
# greps all authors and presents them in descending commit order # greps all authors and presents them in descending commit order
git log --all --format='%aN <%aE>' | awk '{arr[$0]++} END{for (i in arr){print arr[i], i;}}' | sort -rn; git log --all --format='%aN <%aE>' | awk '{arr[$0]++} END{for (i in arr){print arr[i], i;}}' | sort -rn;
#git log --all --format='%aN' | awk '{arr[$0]++} END{for (i in arr){print arr[i], i;}}' | sort -rn;

10
gitattributes Normal file
View file

@ -0,0 +1,10 @@
*.c diff=cpp text eol=lf filter=uncrustify_cpp
*.cpp diff=cpp text eol=lf filter=uncrustify_cpp
*.css text eol=auto diff=css
*.gif diff=image
*.h diff=cpp text eol=lf filter=uncrustify_cpp
*.hpp diff=cpp text eol=lf filter=uncrustify_cpp
*.html text eol=auto diff=html
*.jpg diff=image
*.png diff=image
*.py text eol=auto diff=python

40
gitconfig Normal file
View file

@ -0,0 +1,40 @@
[color]
ui = auto
[credential]
helper = store
[rebase]
autoStash = true
autoSquash = true
[push]
default = upstream
[diff]
renames = copies
renameLimit = 65536
[branch "master"]
rebase = true
[pull]
rebase = true
[http]
sslCAPath = /etc/ssl/certs
sslVerify = true
[core]
preloadindex = 1
attributesfile = ~/.gitattributes
[merge]
renormalize = true
conflictstyle = diff3
[pack]
threads = 0
[filter "uncrustify_cpp"]
clean = /usr/bin/uncrustify -c /home/schtobia/.config/uncrustify/cpp.cfg -l cpp

View file

@ -1,41 +0,0 @@
[alias]
st = status
ci = commit
di = diff
wdi = diff --color-words
co = checkout
up = fetch --all
hg = !git-hg
[color]
ui = auto
[gui]
fontdiff = -family \"Droid Sans Mono\" -size 8 -weight normal -slant roman -underline 0 -overstrike 0
fontui = -family \"DejaVu Sans\" -size 9 -weight normal -slant roman -underline 0 -overstrike 0
spellingdictionary = en
# recognize file copies
[diff]
renames = copies
renameLimit = 65536
[push]
default = upstream
[branch "master"]
rebase = true
[pull]
rebase = true
[http]
sslCAPath = /etc/ssl/certs
sslVerify = true
[commit]
gpgsign = true
[core]
preloadindex = 1