diff --git a/git/.gitconfig b/git/.gitconfig index 67675db..1d59f75 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -1,32 +1,25 @@ [core] excludesfile = ~/.gitignore + +[user] + email = bruno.belanyi@epita.fr + name = Bruno BELANYI + +[blame] + coloring = repeatedLines + markUnblamables = true + markIgnoredLines = true + +[branch] + autosetubrebase = always + [color] ui = auto branch = auto diff = auto interactive = auto status = auto -[commit] - verbose = true -[pull] - rebase = true -[branch] - autosetubrebase = always -[push] - default = simple -[rebase] - autoSquash = true - autoStash = true -[blame] - coloring = repeatedLines - markUnblamables = true - markIgnoredLines = true -[diff] - algorithm = patience -[pager] - diff = /usr/share/git/diff-highlight/diff-highlight | less - log = /usr/share/git/diff-highlight/diff-highlight | less - show = /usr/share/git/diff-highlight/diff-highlight | less + [color "diff"] commit = yellow meta = yellow @@ -34,15 +27,33 @@ old = red new = green whitespace = red reverse + [color "diff-highlight"] oldNormal = red bold oldHighlight = red bold 52 newNormal = green bold newhighlight = green bold 22 -[user] - email = bruno.belanyi@epita.fr - name = Bruno BELANYI +[commit] + verbose = true + +[diff] + algorithm = patience + +[pager] + diff = /usr/share/git/diff-highlight/diff-highlight | less + log = /usr/share/git/diff-highlight/diff-highlight | less + show = /usr/share/git/diff-highlight/diff-highlight | less + +[pull] + rebase = true + +[push] + default = simple + +[rebase] + autoSquash = true + autoStash = true [alias] lol = log --graph --decorate --pretty=oneline --abbrev-commit