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]
|
[user]
|
||||||
email = mail@pratik.live
|
email = mail@pratik.live
|
||||||
name = Pratik Tripathy
|
name = Pratik Tripathy
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
autocrlf = input
|
autocrlf = input
|
||||||
editor = nvim
|
editor = nvim
|
||||||
excludesfile = ~/.gitignore
|
excludesfile = ~/.gitignore
|
||||||
|
|
||||||
# Make `git rebase` safer on macOS
|
# Make `git rebase` safer on macOS
|
||||||
# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
|
# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
|
||||||
trustctime = false
|
trustctime = false
|
||||||
|
|
||||||
[diff]
|
[diff]
|
||||||
tool = vscode
|
tool = vscode
|
||||||
|
|
||||||
[difftool "vscode"]
|
[difftool "vscode"]
|
||||||
cmd = "code --wait --diff $LOCAL $REMOTE"
|
cmd = "code --wait --diff $LOCAL $REMOTE"
|
||||||
|
|
||||||
[merge]
|
[merge]
|
||||||
tool = vscode
|
tool = vscode
|
||||||
conflictstyle = diff3
|
conflictstyle = diff3
|
||||||
|
|
||||||
[mergetool]
|
[mergetool]
|
||||||
prompt = true
|
prompt = true
|
||||||
keepBackup = false
|
keepBackup = false
|
||||||
|
|
||||||
[mergetool "vscode"]
|
[mergetool "vscode"]
|
||||||
cmd = code --wait $MERGED
|
cmd = code --wait $MERGED
|
||||||
|
|
||||||
[log]
|
[log]
|
||||||
date = local
|
date = local
|
||||||
|
|
||||||
[alias]
|
[alias]
|
||||||
ll = log --pretty=format:'%Cblue%cn (%ce)%Creset committed %Cred%h%Creset %Cgreen%cr%Creset:%n%B'
|
ll = log --pretty=format:'%Cblue%cn (%ce)%Creset committed %Cred%h%Creset %Cgreen%cr%Creset:%n%B'
|
||||||
unstage = restore --staged .
|
unstage = restore --staged .
|
||||||
cleanup = "!git remote prune origin && git gc && git clean -df && git stash clear"
|
cleanup = "!git remote prune origin && git gc && git clean -df && git stash clear"
|
||||||
|
|
||||||
[rerere]
|
[rerere]
|
||||||
enabled = true
|
enabled = true
|
||||||
|
|||||||
Reference in New Issue
Block a user