mirror of
https://github.com/kogakure/dotfiles.git
synced 2026-02-03 12:15:29 +00:00
feat: add delta diff viewer
This commit is contained in:
12
gitconfig
12
gitconfig
@@ -9,6 +9,16 @@
|
|||||||
excludesfile = ~/.gitignore
|
excludesfile = ~/.gitignore
|
||||||
legacyheaders = false
|
legacyheaders = false
|
||||||
whitespace = trailing-space,space-before-tab
|
whitespace = trailing-space,space-before-tab
|
||||||
|
pager = delta
|
||||||
|
[interactive]
|
||||||
|
diffFilter = delta --color-only
|
||||||
|
[add.interactive]
|
||||||
|
useBuildtin = false
|
||||||
|
[delta]
|
||||||
|
navigate = true
|
||||||
|
light = false
|
||||||
|
line-numbers = true
|
||||||
|
syntax-theme = Dracula
|
||||||
[alias]
|
[alias]
|
||||||
st = status
|
st = status
|
||||||
ci = commit
|
ci = commit
|
||||||
@@ -62,11 +72,13 @@
|
|||||||
[diff]
|
[diff]
|
||||||
tool = Kaleidoscope
|
tool = Kaleidoscope
|
||||||
algorithm = patience
|
algorithm = patience
|
||||||
|
colorMoved = default
|
||||||
[difftool]
|
[difftool]
|
||||||
prompt = false
|
prompt = false
|
||||||
[difftool "Kaleidoscope"]
|
[difftool "Kaleidoscope"]
|
||||||
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
|
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
|
||||||
[merge]
|
[merge]
|
||||||
|
conflictstyle = diff3
|
||||||
tool = Kaleidoscope
|
tool = Kaleidoscope
|
||||||
[mergetool]
|
[mergetool]
|
||||||
prompt = false
|
prompt = false
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ sad.setup({
|
|||||||
diff = "delta", -- you can use `diff`, `diff-so-fancy`
|
diff = "delta", -- you can use `diff`, `diff-so-fancy`
|
||||||
ls_file = "fd", -- also git ls_file
|
ls_file = "fd", -- also git ls_file
|
||||||
exact = false, -- exact match
|
exact = false, -- exact match
|
||||||
vsplit = true, -- split sad window the screen vertically, when set to number
|
vsplit = false, -- split sad window the screen vertically, when set to number
|
||||||
height_ratio = 0.6, -- height ratio of sad window when split horizontally
|
height_ratio = 0.5, -- height ratio of sad window when split horizontally
|
||||||
width_ratio = 0.6, -- height ratio of sad window when split vertically
|
width_ratio = 0.5, -- height ratio of sad window when split vertically
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ brew install gcc # GNU compiler collection
|
|||||||
brew install gh # GitHub command-line tool
|
brew install gh # GitHub command-line tool
|
||||||
brew install giflib # GIF library using patented LZW algorithm
|
brew install giflib # GIF library using patented LZW algorithm
|
||||||
brew install git # Distributed revision control system
|
brew install git # Distributed revision control system
|
||||||
|
brew install git-delta # Syntax-highlighting pager for git and diff output
|
||||||
brew install git-extras # Small git utilities
|
brew install git-extras # Small git utilities
|
||||||
brew install git-fixup # Alias for git commit --fixup <ref>
|
brew install git-fixup # Alias for git commit --fixup <ref>
|
||||||
brew install git-lfs # Git extension for versioning large files
|
brew install git-lfs # Git extension for versioning large files
|
||||||
|
|||||||
Reference in New Issue
Block a user