mirror of
https://github.com/pratiktri/dotfiles.git
synced 2026-02-04 16:41:43 +05:30
50 lines
918 B
INI
50 lines
918 B
INI
[user]
|
|
email = mail@pratik.live
|
|
name = Pratik Tripathy
|
|
|
|
[core]
|
|
autocrlf = input
|
|
editor = nvim
|
|
excludesfile = ~/.gitignore
|
|
|
|
# Make `git rebase` safer on macOS
|
|
# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
|
|
trustctime = false
|
|
|
|
[diff]
|
|
tool = vscode
|
|
|
|
[difftool "vscode"]
|
|
cmd = "code --wait --diff $LOCAL $REMOTE"
|
|
|
|
[merge]
|
|
tool = vscode
|
|
conflictstyle = diff3
|
|
|
|
[mergetool]
|
|
prompt = true
|
|
keepBackup = false
|
|
|
|
[mergetool "vscode"]
|
|
cmd = code --wait $MERGED
|
|
|
|
[log]
|
|
date = local
|
|
|
|
[alias]
|
|
ll = log --pretty=format:'%Cblue%cn (%ce)%Creset committed %Cred%h%Creset %Cgreen%cr%Creset:%n%B'
|
|
unstage = restore --staged .
|
|
cleanup = "!git remote prune origin && git gc && git clean -df && git stash clear"
|
|
|
|
[rerere]
|
|
enabled = true
|
|
|
|
[branch]
|
|
sort = -committerdate
|
|
|
|
[fetch]
|
|
writeCommitGraph = true
|
|
|
|
[credential]
|
|
helper = cache --timeout=21600
|