Nulo/sitio
Archived
1
0
Fork 0
Code Issues 3 Pull requests Packages Projects Releases Activity

Git: Usar delta para diffs

Browse source
This commit is contained in:
Cat /dev/Nulo 2022-02-03 18:59:25 -03:00
parent 2409c18e5e
commit 0406cd03b2
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Git.md
View file

@ -1,18 +1,22 @@
- [Git es difícil](https://mastodon.sdf.org/@khm/107301080271400610) - [Git es difícil](https://mastodon.sdf.org/@khm/107301080271400610)
- ["¿Como puedo confiar en esta repo de Git? "](https://anarc.at/blog/2020-03-17-git-gpg-verification/] de Anarcat (en inglés) - ["¿Como puedo confiar en esta repo de Git? "](https://anarc.at/blog/2020-03-17-git-gpg-verification/] de Anarcat (en inglés)
## Diffs útiles para Alpine ## Diffs útiles con [delta](https://github.com/dandavison/delta)
- `apk add git-diff-highlight less` - `apk add delta less`
- `~/.gitconfig` - `~/.gitconfig`
``` ```
[pager] [core]
log = diff-highlight | less pager = delta
show = diff-highlight | less
diff = diff-highlight | less
[interactive] [interactive]
diffFilter = diff-highlight diffFilter = delta --color-only
[delta]
light = true # Cambiar a dark si se usa tema oscuro
navigate = true # use n and N to move between diff sections
[merge]
conflictstyle = diff3
[diff]
colorMoved = default
``` ```
Gracias: [Better Diff Highlighting in Git](https://joelclermont.com/post/2021-02/better-diff-highlighting-in-git/)