Skip to content

Instantly share code, notes, and snippets.

@danielestevez
Last active December 2, 2021 19:40
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save danielestevez/d0e4e7536a88666628ff to your computer and use it in GitHub Desktop.
Save danielestevez/d0e4e7536a88666628ff to your computer and use it in GitHub Desktop.
#[user]
# signingkey = xxxxx
# email = contact@danielestevez.com
# name = Dani Estevez
[user]
name = daniel.estevez
email = daniel.estevez@ubisoft.com
[includeIf "gitdir:~/ubisoftWS/"]
path = .gitconfig_ubi
[url "git@gitlab-ncsa.ubisoft.org:"]
insteadOf = https://gitlab-ncsa.ubisoft.org/
[alias]
cl = clone
co = checkout
ci = commit
cs = commit -S
st = status
cp = cherry-pick
cps = cherry-pick -S
# ps = push HEAD
# pl = pull HEAD
pr = !git pull --rebase origin $(git symbolic-ref HEAD | sed -e 's,.*/\\(.*\\),\\1,') --autostash
# xx = !sh -c 'ls' #sample of calling SH from git
# yy = !sh -c '$(git symbolic-ref HEAD | sed -e 's,.*/\\(.*\\),\\1,\\')'
pl = !git pull origin $(git symbolic-ref HEAD | sed -e 's,.*/\\(.*\\),\\1,')
ps = !git push origin $(git symbolic-ref HEAD | sed -e 's,.*/\\(.*\\),\\1,')
pf = !git push origin $(git symbolic-ref HEAD | sed -e 's,.*/\\(.*\\),\\1,') --force-with-lease
fa = !git fetch --all
lg = log --graph
lgs = log --graph --show-signature
#--no-commit
#--no-commit
#$(git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,')
[apply]
whitespace = nowarn
[core]
excludesfile = /home/dani/.gitignore_global
editor = vim
autocrlf = input
[color]
status = auto
branch = auto
interactive = auto
diff = auto
ui = true
pager = true
[format]
pretty=format:%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset
# [color]
# status = always
# interactive = always
# diff = auto
[merge]
tool = SemanticMerge
[mergetool "SemanticMerge"]
keepBackup = false
trustExitCode = false
cmd = \"semanticmerge\" -b=\"$BASE\" -d=\"$LOCAL\" -s=\"$REMOTE\" -r=\"$MERGED\" -l=csharp -emt=\"mergetool.exe -b=\"\"@basefile\"\" -bn=\"\"@basesymbolic\"\" -s=\"\"@sourcefile\"\" -sn=\"\"@sourcesymbolic\"\" -d=\"\"@destinationfile\"\" -dn=\"\"@destinationsymbolic\"\" -r=\"\"@output\"\" -t=\"\"@filetype\"\" -i=\"\"@comparationmethod\"\" -e=\"\"@fileencoding\"\"\" -edt=\"mergetool.exe -s=\"\"@sourcefile\"\" -sn=\"\"@sourcesymbolic\"\" -d=\"\"@destinationfile\"\" -dn=\"\"@destinationsymbolic\"\" -t=\"\"@filetype\"\" -i=\"\"@comparationmethod\"\" -e=\"\"@fileencoding\"\"\"
[push]
default = current
[credential]
helper = store --file ~/.git-credentials
[fetch]
prune = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment