Skip to content

Instantly share code, notes, and snippets.

@lkurzyniec
Last active May 25, 2023 08:25
Show Gist options
  • Save lkurzyniec/2566b5d6286663c4a0e54c554dffdb1e to your computer and use it in GitHub Desktop.
Save lkurzyniec/2566b5d6286663c4a0e54c554dffdb1e to your computer and use it in GitHub Desktop.
gitconfig
[user]
name = Łukasz Kurzyniec
email = lkurzyniec@users.noreply.github.com
[core]
autocrlf = true
excludesfile = C:\\Users\\lkurzyniec\\.gitignore_global
editor = notepad
[diff]
tool = winmerge
[merge]
tool = kdiff3
[mergetool]
keepBackup = false
[difftool "winmerge"]
cmd = 'C:/Program Files (x86)/WinMerge/WinMergeU.exe' -e \"$LOCAL\" \"$REMOTE\"
[mergetool "kdiff3"]
cmd = 'C:/Program Files/KDiff3/kdiff3.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\"
trustExitCode = true
keepBackup = false
[push]
default = simple
[fetch]
prune = true
[alias]
co = checkout
cb = checkout -b
cod = checkout .
unstage = reset --
mt = mergetool
dt = difftool
b = branch
bc = branch --contains
brc = branch -r --contains
f = fetch
s = status
c = commit
camd = commit --amend
a = add
ad = add .
aa = add **
ai = add -i
rc = rebase --continue
last = difftool HEAD~1
lg = log --color --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
qfix = "!f() { git worktree add -b \"$1\" ./fix/\"$1\" origin/develop; }; f"
develup = fetch origin develop:develop
fpush = push -f origin
amfpush = "!f() { git aa && git commit --amend --no-edit && git fpush; }; f"
ls = "!git config -l | grep alias | cut -c 7-"
[includeIf "gitdir/i:c:/git/work/"]
path = .gitconfig-work
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment