Code Snippets Git Config

Short texts Git Config 🧑‍💻 Code snippets Git Config ✍️ Reading lists Git Config 👀

Git diff and merge with p4merge (macOS)

[merge] keepBackup = false tool = p4merge [mergetool “p4merge”] cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge “\”$PWD/$BASE\”” “\”$PWD/$REMOTE\”” “\”$PWD/$LOCAL\”” “\”$PWD/$MERGED\”” keepTemporaries = false trustExitCode = false keepBackup = false [diff] tool = p4merge [difftool “p4merge”] cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge “\”$LOCAL\”” “\”$REMOTE\””

simple zshrc config file with Oh-My-ZSH

[user] name = Julien Bisconti email = ****** [core] excludesfile = ~/.gitignore pager = diff-so-fancy | less –tabs=1,5 -R editor = /usr/bin/vim [alias] wow = log –all –graph –decorate –oneline –simplify-by-decoration [color] ui = always [color “diff”] meta = yellow bold commit = green bold frag = magenta bold old = red bold new = […]

Preferred git config

[filter “lfs”] smudge = git-lfs smudge — %f process = git-lfs filter-process required = true clean = git-lfs clean — %f [user] name = Andreas Bergem email = … [init] defaultBranch = master [credential] helper = manager [core] editor = Notepad autocrlf = true [alias] lg1-this = log –graph –abbrev-commit –decorate –format=format:’%C(bold blue)%h%C(reset) – %C(bold […]

alias .gitconfig

[alias] me = config –global user.email ‘[email protected]’ pro = config –global user.email ‘[email protected]’ ci = commit bd = branch -d — co = checkout cm = checkout master ch = checkout homolog cb = checkout -b st = status -sb sf = show –name-only pu = push -u origin fc = fetch –all –prune ll […]