Skip to content

Instantly share code, notes, and snippets.

@crmaxx
Created February 9, 2020 22:32
Show Gist options
  • Save crmaxx/806210e7ce7089834dd8f0ab812300ff to your computer and use it in GitHub Desktop.
Save crmaxx/806210e7ce7089834dd8f0ab812300ff to your computer and use it in GitHub Desktop.
.gitconfig
[user]
name = Maxim Zhukov
email = [email protected]
[core]
excludesfile = /Users/mzhukov/.gitignore_global
editor = subl -w
logAllRefUpdates = true
#autocrlf = true
[credential]
helper = osxkeychain
[alias]
new = checkout -b
co = checkout
ci = commit
cm = commit -m
cam = commit -am
ca = commit --amend # careful
st = status
br = branch
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen--> %cr%Creset by %Cblue%cN <%cE>%Creset' --abbrev-commit --date=relative
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
type = cat-file -t
dump = cat-file -p
s = status --short
a = !git add . && git status
au = !git add -u . && git statustus
aa = !git add . && git add -u . && git status
ac = !git add . && git commit
acm = !git add . && git commit -m
put = push origin HEAD
get = pull origin HEAD
[color]
ui = true
diff = true
branch = auto
status = auto
[merge]
tool = p4mergetool
ff = only
[pull]
rebase = true
[push]
default = simple
followTags = true
[mergetool]
keepBackup = false
prompt = false
[mergetool "p4mergetool"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $PWD/$BASE $PWD/$REMOTE $PWD/$LOCAL $PWD/$MERGED
trustExitCode = false
[difftool]
prompt = false
[difftool "p4mergetool"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $LOCAL $REMOTE
[filter "media"]
required = true
clean = git media clean %f
smudge = git media smudge %f
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
[status]
showUntrackedFiles = all
#[commit]
# gpgSign = true
[transfer]
fsckobjects = false
[fsck]
zeroPaddedFilemode = ignore
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment