vim-mergetool
autobots
| vim-mergetool | autobots | |
|---|---|---|
| 2 | 5 | |
| 1 | 70 | |
| - | - | |
| 10.0 | 7.5 | |
| about 2 years ago | 1 day ago | |
| Vim Script | Shell | |
| MIT License | GNU General Public License v3.0 only |
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.
autobots
-
Ask HN: What are your favorite iOS/macOS automations?
sort of an automation, but I install all my favorite apps with brew and then use brew again (brew upgrade && brew upgrade --cask -g) to update everything
Bonus: I went the extra mile and wrote a script that bootstraps my entire setup: https://github.com/fastily/autobots/blob/master/macOS/setup/...
-
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
-
Ask HN: 我可以看看你的剧本吗？ (Ask HN: Can I see your scripts?)
I'll go first: https://github.com/fastily/autobots
- Ask HN: Can I see your scripts?
What are some alternatives?
fuz - Fuzzy search text / notes in the terminal, for any collection of text files
ack3 - ack is a grep-like search tool optimized for source code.
spellbook - 🪄 Shell and Powershell scripts registry
IKEv2-setup - Set up Ubuntu Server 20.04 (or 18.04) as an IKEv2 VPN server
stderred - stderr in red
hacker-scripts - Based on a true story
atuin - ✨ Magical shell history
dotfiles - dotfiles for vim, git, zsh, tmux, cwm, xinit, and many others.
bitbar - Put the output from any script or program into your macOS Menu Bar (the BitBar reboot)
dotfiles
argos - Create GNOME Shell extensions in seconds