dot-files/git/.gitconfig

[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

[color "diff"]
    commit = yellow
    meta = yellow
    frag = cyan
    old = red
    new = green
    whitespace = red reverse

[color "diff-highlight"]
    oldNormal = red bold
    oldHighlight = red bold 52
    newNormal = green bold
    newhighlight = green bold 22

[commit]
    verbose = true

[diff]
    algorithm = patience

[merge]
    tool = fugitive

[mergetool "fugitive"]
    cmd = vim -f -c \"Gdiff!\" \"$MERGED\"
    trustExitCode = true

[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
    lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
    trim = reflog expire --expire-unreachable=now --all
    chop = gc --prune=now
    optimize = repack -a -d -f --depth=250 --window=250
    pf = pull --ff-only

[filter "lfs"]
    clean = git-lfs clean -- %f
    smudge = git-lfs smudge -- %f
    process = git-lfs filter-process
    required = true
[ADD] git global configuration 2019-07-11 13:54:59 +02:00			`[core]`
[ADD][GIT] Aliases for logging and misc utilities 2019-07-13 00:55:04 +02:00			`excludesfile = ~/.gitignore`
[UPDATE][GIT] Re-order configuration file I want the core and the user settings on top, all but the alias sections and sections added by plug-ins to be in alphabetical order, then the aliases, followed by plug-in related settings (such as git-lfs). 2019-10-10 21:13:43 +02:00
			`[user]`
			`email = bruno.belanyi@epita.fr`
			`name = Bruno BELANYI`

			`[blame]`
			`coloring = repeatedLines`
			`markUnblamables = true`
			`markIgnoredLines = true`

			`[branch]`
			`autosetubrebase = always`

[ADD] git global configuration 2019-07-11 13:54:59 +02:00			`[color]`
[ADD][GIT] Aliases for logging and misc utilities 2019-07-13 00:55:04 +02:00			`ui = auto`
			`branch = auto`
			`diff = auto`
			`interactive = auto`
			`status = auto`
[UPDATE][GIT] Re-order configuration file I want the core and the user settings on top, all but the alias sections and sections added by plug-ins to be in alphabetical order, then the aliases, followed by plug-in related settings (such as git-lfs). 2019-10-10 21:13:43 +02:00
[ADD][GIT] Better diff colors I like having some colors for the meta-information shown during diff operations. Using the `diff-hightlight` script, you can get character-level highlights of your diffs (just like GitHub and GitLab). 2019-10-10 21:07:15 +02:00			`[color "diff"]`
			`commit = yellow`
			`meta = yellow`
			`frag = cyan`
			`old = red`
			`new = green`
			`whitespace = red reverse`
[UPDATE][GIT] Re-order configuration file I want the core and the user settings on top, all but the alias sections and sections added by plug-ins to be in alphabetical order, then the aliases, followed by plug-in related settings (such as git-lfs). 2019-10-10 21:13:43 +02:00
[ADD][GIT] Better diff colors I like having some colors for the meta-information shown during diff operations. Using the `diff-hightlight` script, you can get character-level highlights of your diffs (just like GitHub and GitLab). 2019-10-10 21:07:15 +02:00			`[color "diff-highlight"]`
			`oldNormal = red bold`
			`oldHighlight = red bold 52`
			`newNormal = green bold`
			`newhighlight = green bold 22`

[UPDATE][GIT] Re-order configuration file I want the core and the user settings on top, all but the alias sections and sections added by plug-ins to be in alphabetical order, then the aliases, followed by plug-in related settings (such as git-lfs). 2019-10-10 21:13:43 +02:00			`[commit]`
			`verbose = true`

			`[diff]`
			`algorithm = patience`

[ADD][GIT] Use vim-fugitive as default mergetool I really like the way vim-fugitive show a merge conflict by having our local index on the left (the target), and the remote changes on the right (what we're trying to merge with our branch). The result is obviously the file in the middle. The d2o and d3o mappings take from local/remote for the current chunk. 2019-10-13 13:41:19 +02:00			`[merge]`
			`tool = fugitive`

			`[mergetool "fugitive"]`
			`cmd = vim -f -c \"Gdiff!\" \"$MERGED\"`
			`trustExitCode = true`

[UPDATE][GIT] Re-order configuration file I want the core and the user settings on top, all but the alias sections and sections added by plug-ins to be in alphabetical order, then the aliases, followed by plug-in related settings (such as git-lfs). 2019-10-10 21:13:43 +02:00			`[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`
[ADD][GIT] Aliases for logging and misc utilities 2019-07-13 00:55:04 +02:00
			`[alias]`
			`lol = log --graph --decorate --pretty=oneline --abbrev-commit`
			`lola = log --graph --decorate --pretty=oneline --abbrev-commit --all`
			`trim = reflog expire --expire-unreachable=now --all`
			`chop = gc --prune=now`
			`optimize = repack -a -d -f --depth=250 --window=250`
			`pf = pull --ff-only`
[ADD][GIT] git-lfs configuration 2019-10-02 13:50:41 +02:00
			`[filter "lfs"]`
			`clean = git-lfs clean -- %f`
			`smudge = git-lfs smudge -- %f`
			`process = git-lfs filter-process`
			`required = true`