vim-mergetool
cheatsheet
vim-mergetool | cheatsheet | |
---|---|---|
2 | 4 | |
1 | 205 | |
- | - | |
10.0 | 5.6 | |
about 2 years ago | 24 days ago | |
Vim Script | ||
MIT License | The Unlicense |
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.
vim-mergetool
- Ask HN: Share a shell script you like
-
Integrating Git and (Neo)Vim: LazyGit + Fugitive + MergeTool for maxiumum efficiency [Showcase]
I like vim-mergetool for merging in vim. It's inspired by the diffconflicts method (but written in vimscript): Diff the resolved conflicts instead of a three way diff with base. You can also switch to three way with :MergetoolToggleLayout LmR too, but I usually only switch to diffing resolved against theirs or ours.
cheatsheet
-
Ask HN: Share a shell script you like
I have quite a few, my personal collection of shell scripts: https://github.com/fastily/autobots
I also curate a shell command cheatsheet: https://github.com/fastily/cheatsheet
- Can I see your cheatsheet?
- Ask HN: Can I see your cheatsheet?
What are some alternatives?
fuz - Fuzzy search text / notes in the terminal, for any collection of text files
cheat - cheat allows you to create and view interactive cheatsheets on the command-line. It was designed to help remind *nix system administrators of options for commands that they use frequently, but not frequently enough to remember.
spellbook - 🪄 Shell and Powershell scripts registry
dotfiles
stderred - stderr in red
zsh-histdb - A slightly better history for zsh
atuin - ✨ Magical shell history
learn_gnuawk - Example based guide to mastering GNU awk
dotfiles - dotfiles for vim, git, zsh, tmux, cwm, xinit, and many others.
tldr - 📚 Collaborative cheatsheets for console commands
dotfiles
cheatsheets - Cheatsheets for web development - devhints.io