I’ve been using Araxis Merge for almost 20 years. This seems… not as good?
Different use case. This is just a diff pager, it's not supposed to help you solve complicated 3 way merges. On a separate tangent - I haven't needed to do a gnarly merge in years it seems like. I feel like the dev community has collectively gotten better at git/SCM in general. Maybe I was super junior before but it's just not a problem I seem to face in daily software dev anymore.
Delta: A syntax-highlighting pager for Git, diff, grep, and blame output
31–40 of 98 posts
Re: Delta: A syntax-highlighting pager for Git, diff, grep, and blame output
#32Earlier quoted context omitted.
Different use case. This is just a diff pager, it's not supposed to help you solve complicated 3 way merges. On a separate tangent - I haven't needed to do a gnarly merge in years it seems like. I feel like the dev community has collectively gotten better at git/SCM in general. Maybe I was super junior before but it's just not a problem I seem to face in daily software dev anymore.
Sure, but I use Araxis Merge as my basic diff tool as well.
Re: Delta: A syntax-highlighting pager for Git, diff, grep, and blame output
#33 git diff --color-words --word-diff-regex='\w+|.'Re: Delta: A syntax-highlighting pager for Git, diff, grep, and blame output
#34I want to like this having used regular `git diff` tool with colours, but this is just too busy.
you might like diffr ( https://github.com/mookid/diffr ) (disclaimer: my project)
Re: Delta: A syntax-highlighting pager for Git, diff, grep, and blame output
#35Delta has been one of those set and forget things, it's been a while since I've seen 'bare' git grep/diff/blame output, I also use it all the time for normal diffs (outside of git repos), but TIL that it also works with ripgrep [0] As someone else already mentioned there is also bat[1], which was also set and forget, I aliased cat to bat and have a seperate alias vcat for 'vanilla cat' /usr/bin/cat [0] https://dandav…
Re: Delta: A syntax-highlighting pager for Git, diff, grep, and blame output
#36Re: Delta: A syntax-highlighting pager for Git, diff, grep, and blame output
#37Earlier quoted context omitted.
If you are getting to check out bat, you might want to check, - rg (ripgrep): A grep replacement - sk (skim): A grep/fzf/fzy replacement - fd: A find replacement that's .gitignore+.ignore aware. - eza: A replacement for ls that's git aware - broot: A TUI file finder to browse large directories - yazi: A file manager (I haven't used this one too much) sk+rg + gawk in action to find files matching some text, sk \ --ans…
I love broot, I use it for everything. I also use foot+fzy as a tiny sway dmenu replacement.. I started to make other kinds of custom tiny TUI popup menus using this strategy and it's great, since it all uses my terminal style and each is an extremely tiny 1 or 2 line script.
Re: Delta: A syntax-highlighting pager for Git, diff, grep, and blame output
#38Re: Delta: A syntax-highlighting pager for Git, diff, grep, and blame output
#39I use both delta and difftastic (difft), and cannot recommend them enough. If you use the terminal at all, get them!
Difftastic and Delta work not only in bare terminals. Both are supported by Magit in Emacs, both are also supported by Lazygit.
That would be one of the coolest news in weeks!
Re: Delta: A syntax-highlighting pager for Git, diff, grep, and blame output
#40Earlier quoted context omitted.
I love broot, I use it for everything. I also use foot+fzy as a tiny sway dmenu replacement.. I started to make other kinds of custom tiny TUI popup menus using this strategy and it's great, since it all uses my terminal style and each is an extremely tiny 1 or 2 line script.
can broot scroll the file preview on the right? ranger can do it, so far I feel ranger is better