Skip to content

Instantly share code, notes, and snippets.

@fbedussi
Last active January 2, 2019 13:46
Show Gist options
  • Save fbedussi/e9e664ea36706b7cfcbe9de7f84ff59a to your computer and use it in GitHub Desktop.
Save fbedussi/e9e664ea36706b7cfcbe9de7f84ff59a to your computer and use it in GitHub Desktop.
My .gitconfig
[http]
sslVerify = false
sslCAinfo = C:/Program Files/Git/usr/ssl/certs/ca-bundle.crt
sslCAinfo = C:/Program Files/Git/usr/ssl/certs/ca-bundle.trust.crt
[core]
autocrlf = true
excludesfile = C:\\Users\\bedussif\\Documents\\gitignore_global.txt
editor = \"C:/Program Files (x86)/GitExtensions/GitExtensions.exe\" fileeditor
ignorecase = false
[user]
name = Francesco Bedussi
email = francesco.bedussi@ynap.com
[alias]
lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
tree = !git lg1
lg = log --graph --oneline --decorate --all --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)'
lgb = log --graph --oneline --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)'
mgt = mergetool --tool bc3
s = status
a = add
aa = add .
c = commit -m
d = diff
ps = push
pl = pull
mt = mergetool
f = fetch
sa = stash
sp = stash pop
mod = merge origin/develop
mom = merge origin/master
lab = branch -la
amend = commit --amend
fixup = commit --amend --no-edit
st = status -sb
co = checkout
cob = checkout -b
cp = cherry-pick
last = log -1 HEAD
unstage = reset HEAD --
r1 = reset HEAD^
r2 = reset HEAD^^
rh = reset HEAD --hard
rh1 = reset HEAD^ --hard
rh2 = reset HEAD^^ --hard
g = grep --break --heading --line-number
ec = config --global -e
cm = !git add -A && git commit -m
save = !git add -A && git commit -m 'SAVEPOINT'
undo = reset HEAD^ --mixed
wip = !git add -u && git commit -m 'WIP'
wipe = !git add -A && git commit -qm 'WIPE SAVEPOINT' && git reset HEAD~1 --hard
[url "https://"]
insteadOf = git://
[http "https://git.yoox.net/"]
sslCAPath = C:/Users/bedussif/.ssh
[merge]
tool = BeyondCompare3
[credential]
helper = !'C:\\Users\\bedussif\\AppData\\Roaming\\GitCredStore\\git-credential-winstore.exe'
[diff]
tool = beyondcompare3
guitool = beyondcompare3
[difftool "beyondcompare3"]
path = C:/Program Files (x86)/Beyond Compare 3/BCompare.exe
cmd = \"C:/Program Files (x86)/Beyond Compare 3/BCompare.exe\" \"$LOCAL\" \"$REMOTE\"
[mergetool "vsdiffmerge"]
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer\\vsdiffmerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m
keepBackup = false
trustExitCode = true
[help]
autocorrect = 1
[mergetool "BeyondCompare3"]
path = C:/Program Files (x86)/Beyond Compare 3/BComp.exe
cmd = \"C:/Program Files (x86)/Beyond Compare 3/BComp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
[rerere]
enabled = 1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment