vim-mergetool
Better vim-based mergetool (by idbrii)
dotfiles
dotfiles for vim, git, zsh, tmux, cwm, xinit, and many others. (by whiteinge)
vim-mergetool | dotfiles | |
---|---|---|
2 | 8 | |
1 | 317 | |
- | - | |
10.0 | 8.6 | |
about 2 years ago | 5 days ago | |
Vim Script | Shell | |
MIT License | - |
The number of mentions indicates the total number of mentions that we've tracked plus the number of user suggested alternatives.
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.
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
Posts with mentions or reviews of vim-mergetool.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2023-08-13.
- 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
Posts with mentions or reviews of dotfiles.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2023-08-13.
-
Ask HN: Share a shell script you like
diffconflicts [dc] lets you resolve diffs as a two way diff between what's in the conflict markers instead of including the resolved parts in the diff. It opens the diff in vim but could be adapted for other editors. Verbose explanation: https://github.com/whiteinge/diffconflicts/blob/master/READM...
The author converted it to a vim plugin with the same name, but I use a different vim plugin implementation [mergetool].
[dc]: https://github.com/whiteinge/dotfiles/blob/master/bin/diffco...
-
Is there any clil tool for downloading documentations?
Example: https://github.com/whiteinge/dotfiles/blob/master/bin/devdocs-local
- whiteinge/dotfiles: dotfiles for vim, git, zsh, cwm, xinit, and many others. Install with: lndir -silent /path/to/dotfiles $HOME
- gotz: CLI tool for cross timezone teams
- Units CLI Question
-
To people who have tons of shell scripts and aliases, how do you organize/categorize them?
Took me several years of forgetting script names before I finally just made a README of filenames and descriptions that I can search when I forget. I didn't want some complicated organization framework.
-
Is there any shortcoming on having a seamless navigation between vim and tmux?
I ran a (mostly) vim-tmux-navigator setup for almost a year but ultimately removed it. It was indeed a seamless way to quickly jump between Vim and tmux panes but I felt it enabled learning some sloppy habits on my part.
-
Autoident drives me nuts. Even when I supposedly turned it off it still does 4 spaces in some places and 2 in others. How do I completely turn this thing off?
I added filetype indent off so that indent plugins for the various languages would not automatically execute, and then I set smartindent so that regardless of what kind of file I'm editing it (very!) simply just re-uses the same indent from the previous line. For everything else I just manually ctrl-t/ctrl-d as I type.
What are some alternatives?
When comparing vim-mergetool and dotfiles you can also consider the following projects:
fuz - Fuzzy search text / notes in the terminal, for any collection of text files
dotfiles - Custom dotfile configurations and settings
spellbook - 🪄 Shell and Powershell scripts registry
dotfiles
stderred - stderr in red
dotfiles - My Dotfiles
atuin - ✨ Magical shell history
zeal-cli - A CLI for managing offline documentation for Zeal.
tmuxcator - A script to manage tmux.
meld - Meld
navi - An interactive cheatsheet tool for the command-line