mirror of
https://github.com/pratiktri/dotfiles.git
synced 2026-02-04 08:41:43 +05:30
fix(gitconfig): File tab-fixed
This commit is contained in:
@@ -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: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
|
||||
trustctime = false
|
||||
# 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
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user