keepass-diff
delta
keepass-diff | delta | |
---|---|---|
2 | 88 | |
275 | 20,765 | |
- | - | |
6.7 | 8.1 | |
5 months ago | 4 days ago | |
Rust | Rust | |
MIT License | MIT License |
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.
keepass-diff
-
KeePassXC 2.7.0 Released
The sync conflicts happened to me whenever I left keepass databases open and changed it on multiple devices. Usually, those changes were adding new accounts into the databases or changing a password on one while adding something on the other. This regularly happened when working in a team.
I assumed people would switch from Keepass + database synced on a private server to something else when they started working in teams and need better/easier permission models. :)
As you have mentioned it, I have written the tool keepass-diff (<https://github.com/Narigo/keepass-diff/>) to help me for exactly these conflicts and I could quickly resolve the issues with it. It was still useful enough to let me keep using Keepass. Was it not working for you or was it too hard to use because of how it needs to be set up first? Would you have stayed with Keepass + sync if something similar to this was integrated into UI clients?
-
LastPass users warned their master passwords are compromised
I had this problem as well, these conflicts may happen when you keep Keepass clients open and add passwords on two different machines.
I have written a CLI tool in Rust called keepass-diff that may help you with this: https://github.com/Narigo/keepass-diff
delta
- Difftastic, a structural diff tool that understands syntax
- Popular Git Config Options
-
So You Think You Know Git – Git Tips and Tricks by Scott Chacon
Thanks for the difftastic & zoxide tips.
However, I've been using this git pager/difftool: https://github.com/dandavison/delta
While it's not structural like difft, it does produce more readable output for me (at least when scrolling fast through git log -p /scanning quickly
-
Essential Command Line Tools for Developers
View on GitHub
- Potencializando Sua Experiência no Linux: Conheça as Ferramentas em Rust para um Desenvolvimento Eficiente
-
Unified versus Split Diff
I'm currently waiting on the integration between Delta and Difftastic:
https://github.com/dandavison/delta/issues/535
Difftastic now has JSON output, whic should make it much easier to build this.
- Delta, a syntax-highlighting pager for Git, diff, and grep output
- Ask HN: What's a new developer tool you recently started using?
-
Magit
I'm surely in the minority here. I've been using Emacs for almost a decade now, but I just can't get into the Magit workflow. I've tried several times, but always end up going back to Git on the command line. I have dozens of aliases, shell integrations, a nice diff viewer[1], etc., and interacting with Git has become muscle memory. I can commit, cherry-pick, rebase, bisect, fix conflicts, etc., in a fraction of the time it would take me to navigate Magit's UI. I'm sure with enough practice, a Magit user could do this more quickly and efficiently, but honestly, with some custom-built porcelain, Git's UI is not so bad. Though this could very well be Stockholm syndrome after using it for such a long time...
For whatever reason, Magit's opinionated workflows never clicked with me. A part of it is the concern that it will do something weird to my repo that I'll then have to waste more time undoing manually. I usually don't trust sugary wrappers around tools. And another is the fact I don't use Emacs on all machines, and setting up Git on a remote system is just a matter of copying over my config and some shell integrations.
Also, on a more personal note, I find the cultish fanboyism whenever Magit is brought up slightly offputting. Does anyone have anything bad to say about it? No software can realistically be this infallible. :)
[1]: https://github.com/dandavison/delta
-
How to use Git?
For looking at diffs I still prefer the command line though, and use delta to view diffs between commits or branches.
What are some alternatives?
similar - A high level diffing library for rust based on diffs
diff-so-fancy - Good-lookin' diffs. Actually… nah… The best-lookin' diffs. :tada:
keepassxc - KeePassXC is a cross-platform community-driven port of the Windows application “Keepass Password Safe”.
difftastic - a structural diff that understands syntax 🟥🟩
keepass-rs - Rust KeePass database file parser for KDB, KDBX3 and KDBX4, with experimental support for KDBX4 writing.
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
KeePass2.x - unofficial mirror of KeePass2.x source code
lazygit - simple terminal UI for git commands
diffsitter - A tree-sitter based AST difftool to get meaningful semantic diffs
vim-gitgutter - A Vim plugin which shows git diff markers in the sign column and stages/previews/undoes hunks and partial hunks.
git-credential-keepassxc - Helper that allows Git (and shell scripts) to use KeePassXC as credential store
gitui - Blazing 💥 fast terminal-ui for git written in rust 🦀