vim-mergetool
z
vim-mergetool | z | |
---|---|---|
2 | 46 | |
1 | 16,081 | |
- | - | |
10.0 | 3.9 | |
about 2 years ago | 3 months ago | |
Vim Script | Shell | |
MIT License | Do What The F*ck You Want To Public 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.
z
-
Ask HN: What software sparks joy when using?
- Visidata
- z (https://github.com/rupa/z)
- fzf
- vim
- Fastmail
- WireGuard
- draw.io
- PowerShell (it’s difficult to overstate how much PS has improved Windows system administration)
- Microsoft PowerToys
- WSL (alternating joy and extreme frustration)
- Home Assistant
- Airfoil
- Z – Jump Around
-
Cdpath: Easily Navigate Directories in the Terminal
For even more power use z
https://github.com/rupa/z
-
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.
-
Use Linux they said
2) Well friend, this is where you can have the best of both of worlds. You can just open the file explorer via the CLI. Typically you'll have the xdg-open command that opens the directory in your default file browser. I have that aliased to xdgo. So you can navigate quickly to where you need to be, and then open it visually with xdgo . . There's also other really convenient navigation tools like z (https://github.com/rupa/z) that I can't imagine going without anymore.
-
Describe your Personal Development Environment
I would like to know how you use the terminal and nvim in your daily workflow. Here is mine: I have a shortcut (with raycast) to open alacritty full screen from anywhere. I open alacritty and start the tmux (create work and personal sessions). Then using z navigate to the desired project. Next, I have a bash script pde that opens nvim, and 2 terminal splits below. Nvim opens with alpha-nvim (startify theme). For file explorer I use lir.nvim. Fuzzy finding using fzf-lua. I have harpoon but don't use it very often, instead, I manage buffers with fzf-lua and vim-bbye. When working on multiple files I usually have 2-4 vsplits. I do git stuff mostly using vim-fugitive (gv.vim, resetting hunks with gitsigns.nvim), occasionally git commands from another tmux window. I use auto-save.nvim. My most used command is :F (lsp.bug.format). For movements I use Ctrl+D/U/O/I/, sometimes relative line jumping. Other often movements [q,]q (quickfix jumps), [d,]d (diagnostics jumps), [c,]c (Gitsigns hunks). Alacritty + Neovim view
-
My favorite bash shortcuts in 2023
For general filesystem navigation in my terminal, I'm using z command. But for finer control, I am using the following commands.
-
What "nice-to-have" CLI tools do you know?
z
-
bashrc inspiration - your favorit trick
Do you know about the program z? https://github.com/rupa/z
-
What “thing” did you discover/create saves you a good amount of time in your work as a developer?
https://github.com/rupa/z is an awesome command to teleport to your most used directories. It's really handy to jump from a project to another.
What are some alternatives?
fuz - Fuzzy search text / notes in the terminal, for any collection of text files
zoxide - A smarter cd command. Supports all major shells.
spellbook - 🪄 Shell and Powershell scripts registry
autojump - A cd command that learns - easily navigate directories from the command line
stderred - stderr in red
fzf - :cherry_blossom: A command-line fuzzy finder
atuin - ✨ Magical shell history
enhancd - :rocket: A next-generation cd command with your interactive filter
dotfiles - dotfiles for vim, git, zsh, tmux, cwm, xinit, and many others.
fasd - Command-line productivity booster, offers quick access to files and directories, inspired by autojump, z and v.
dotfiles
zsh-z - Jump quickly to directories that you have visited "frecently." A native Zsh port of z.sh with added features.