pyxargs
diffconflicts
pyxargs | diffconflicts | |
---|---|---|
4 | 16 | |
4 | 381 | |
- | - | |
8.6 | 2.4 | |
3 months ago | 5 months ago | |
Python | Vim Script | |
GNU General Public License v3.0 only | BSD 3-clause "New" or "Revised" 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.
pyxargs
-
Modern Linux Tools vs. Unix Classics: Which Would I Choose?
> I too can never remember jq syntax when I need to. I usually just end up writing a Python script
Same here! That's why for small things I made pyxargs [1] to use python in the shell. In another thread I also just learned of pyp [2] which I haven't tried yet but looks like it'd be even better for this use case.
[1] https://github.com/elesiuta/pyxargs
[2] https://github.com/hauntsaninja/pyp
-
Alternative Shells
I personally use fish, but mostly for the out of the box auto completions and highlighting, I don't use it for actual scripting, nor have it set as the login shell due to the 2nd reason you mentioned.
I mostly use python as well, and for some short commands I made pyxargs [1] which lets you run python code on stdin, or a walk of your current directory.
[1] https://github.com/elesiuta/pyxargs
-
Ask HN: Share a shell script you like
pyxargs --py "print('{}') if os.path.ismount('{}') else ''" | pyxargs fusermount -u {}
My primary use case was using this with ffmpeg due to the encoding problem with xargs [2].
It can also run commands in parallel using a terminal multiplexer so outputs don't get mixed up or if they require user input.
[1] https://github.com/elesiuta/pyxargs
- Show HN: Clamshell- an experimental Python based shell
diffconflicts
-
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...
-
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.
-
Poll: how do you jump to Git conflict markers?
https://github.com/whiteinge/diffconflicts as a merge tool
-
What is the coolest, unknown(-ish) plugin that you're using that other people could benefit from?
https://github.com/whiteinge/diffconflicts is not unknown, but I think deserves way more attention. It transforms the way you resolve merge conflicts unlike any other tool I've seen.
-
Your git setup for neovim?
For resolving conflicts, I like https://github.com/whiteinge/diffconflicts. It's really good at cutting the noise from conflict markers and only showing what matters.
- Here's a question
-
Vim Regex
For resolving conflicts I recommend https://github.com/whiteinge/diffconflicts, the demo video explains it best https://www.youtube.com/watch?v=Pxgl3Wtf78Y.
-
What have you changed in your VIM workflow recently?
have you tried diffconflicts? started using it ages ago, might be worth checking out if you get tired of editing by hand.
- Which tools do you use for Git Conflicts?
-
Is there a better way to see git diff in vim?
I end up using https://github.com/whiteinge/diffconflicts it does the job I have looked for, I have adjusted the way it a bit to look more like 3 splits solver rather with 2 splits.
What are some alternatives?
fuz - Fuz is a blazingly fast folder, file and text searcher
lazygit.nvim - Plugin for calling lazygit from within neovim.
spellbook - 🪄 Shell and Powershell scripts registry
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
pyp - Easily run Python at the shell! Magical, but never mysterious.
conflict-marker.vim - Weapon to fight against conflicts in Vim.
dotfiles
vim-diff-enhanced - Better Diff options for Vim
gron - Make JSON greppable!
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
bf.jq - Brainfuck interpreter written in jq -- This is the proof that jq is turing-complete!
neovim - Vim-fork focused on extensibility and usability