GitLab Configuration

Configuration

Globale

git config --global -e

donne

[user]
	email = {email}
	name = Bertrand DELION
[core]
	editor = '{path to WSCode}\\Microsoft VS Code\\Code.exe' --wait

# ------------------ M E R G E -------------------------
[merge]
    tool = meld

[mergetool "meld"]
    cmd = meld --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output \"$MERGED\" --label \"MERGE (REMOTE BASE MY)\"
   trustExitCode = false

[mergetool]
    # don't ask if we want to skip merge
    prompt = false

    # don't create backup *.orig files
    keepBackup = false

# ------------------ D I F F -------------------------
[diff]
    guitool = meld

[difftool "meld"]
    cmd = \"C:/Program Files (x86)/Meld/bin/meld\" \"$LOCAL\" \"$REMOTE\" --label \"DIFF (ORIGINAL MY)\"

Locale

git config --local -e

donne

[core]
	repositoryformatversion = 0
	filemode = false
	bare = false
	logallrefupdates = true
	symlinks = false
	ignorecase = true
[remote "origin"]
	url = https://github.com/bdelion/gitflow-graph-2.git
	fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
	remote = origin
	merge = refs/heads/master
[gitflow "branch"]
	master = master
	develop = develop
[gitflow "prefix"]
	feature = feature/
	bugfix = bugfix/
	release = release/
	hotfix = hotfix/
	support = support/
	versiontag = 
[gitflow "path"]
	hooks = {path to project}/gitflow-graph-2/.git/hooks
[gitflow "branch.feature/1.0.0"]
	base = develop
[gitflow "branch.bugfix/bugfix-001"]
	base = develop

Système

git config --system -e

donne

[http]
	sslCAInfo = {path to git}/Git/mingw64/ssl/certs/ca-bundle.crt
	sslBackend = openssl
[diff "astextplain"]
	textconv = astextplain
[filter "lfs"]
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process
	required = true
[credential]
	helper = manager