vim-mergetool
dotfiles
| vim-mergetool | dotfiles | |
|---|---|---|
| 2 | 1 | |
| 1 | 0 | |
| - | - | |
| 10.0 | 8.4 | |
| about 2 years ago | 15 days ago | |
| Vim Script | Vim Script | |
| 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.
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.
dotfiles
-
Ask HN: Share a shell script you like
- quickly jump to recent directory: https://github.com/rupa/z - however I find it kinda annoying it seems to forget/ignore(?) directories, anyone know of a better version of this?
- quickly opening my personal wiki: https://github.com/francium/dotfiles/blob/master/bin/.local/...
- re-run a script when a file changes: https://github.com/francium/dotfiles/blob/master/bin/.local/...
For `while-watchdo` you, you run it like `while-watchdo "echo hi"`, then in my editor, I have a custom shortcut that does `touch .watchfile` causing the command, in this case `echo hi` to run. I prefer this to tools that retrigger commands as soon as you save _any_ file. Also works in docker containers, edit a file on host, command runs in a container.
What are some alternatives?
fuz - Fuzzy search text / notes in the terminal, for any collection of text files
spellbook - 🪄 Shell and Powershell scripts registry
dotfiles - dotfiles for vim, git, zsh, tmux, cwm, xinit, and many others.
stderred - stderr in red
atuin - ✨ Magical shell history
meld - Meld
pyxargs - Command line Python scripting with an xargs-like interface and AWK-like capabilities for data processing and task automation