diff --git a/common/.gitconfig b/common/.gitconfig index c703092..2a11774 100644 --- a/common/.gitconfig +++ b/common/.gitconfig @@ -1,40 +1,40 @@ [user] - email = mail@pratik.live - name = Pratik Tripathy + email = mail@pratik.live + name = Pratik Tripathy [core] - autocrlf = input - editor = nvim - excludesfile = ~/.gitignore + autocrlf = input + editor = nvim + excludesfile = ~/.gitignore - # Make `git rebase` safer on macOS - # More info: - trustctime = false + # Make `git rebase` safer on macOS + # More info: + trustctime = false [diff] - tool = vscode + tool = vscode [difftool "vscode"] - cmd = "code --wait --diff $LOCAL $REMOTE" + cmd = "code --wait --diff $LOCAL $REMOTE" [merge] - tool = vscode - conflictstyle = diff3 + tool = vscode + conflictstyle = diff3 [mergetool] - prompt = true + prompt = true keepBackup = false [mergetool "vscode"] - cmd = code --wait $MERGED + cmd = code --wait $MERGED [log] - date = local + 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" + 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