gh-f
git-conflict.nvim
Our great sponsors
gh-f | git-conflict.nvim | |
---|---|---|
17 | 10 | |
243 | 777 | |
- | - | |
5.8 | 7.4 | |
about 1 month ago | 3 months ago | |
Shell | Lua | |
The Unlicense | - |
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.
gh-f
-
gh-f adds diff per filetype and other small improvements
gh-f is a GitHub CLI extension that I wrote that does all-things-fzf for git. From time to time I add new small features or quality of life adjustments :).
-
fzf is so powerful when you use it well ! code/files/tags/git history
If you are into github CLI extensions, check out the ultimate fzf git extension: gh-f (unrelated to neovim, but shamelessy I am the author).
-
Git workflow
I deal with most of my git workflow from terminal simply because I find git to be easiest to use from the command line, where each command is verbose enough for you to understand what you are doing, and so is its output. Lately, with the introduction of the gh CLI things have gotten even easier, and all the workflow of branches, PRs, releases, runs and so forth is easily handled via command line as well: I wrote gh-f, an extension that integrates gh with fzf and you're good to go at the speed of light.
-
gh-f stable release 1.0.0
I have worked on gh-f for about one year and I have now reached the point where I consider it to be stable and robust enough to award it a full 1.0.0 release.
-
A Better Git Diff with Delta
You may want to check out gh-f, where most of the functions/alias shown in the videos are packaged as gh CLI extension.
-
CLI to Search, Preview, & Check Out a GitHub PR
Nice, wasn't aware of that. Enjoying looking at the code underneath https://github.com/gennaro-tedesco/gh-f/blob/master/gh-f
-
Is there a TUI version of Github?
gh cli with some gh extensions, like gh-f, gh-s, and gh-i, can get you most of the way there
-
If you could chose only one, would you choose "vim-fugitive" or "lazygit", and why?
If you are interesting in cherrypicking (and much more) you may want to have a look at gh-f, a GitHub CLI extension that works with fzf (in particular look at gh f -k)
-
gh-f: now grep through revision history!
Another feature added to gh-f: grep regex pattern through revision history. What about that piece of code you deleted, and now you want to quickly check the old revision file to copy and paste? Say no more: prompt for regex pattern, choose the file name, browse the revision history with preview and show the old file containing the piece of code you are after!
git-conflict.nvim
- Ask HN: What is your favorite tool to resolve Git merge conflicts?
-
How do I make treesitter highlight conflict markers properly?
git-conflicts.nvim plugin provides highlighting for conflict markers.
- Neovim - Workflow para Java, C# e JS/TypeScript (Atualizaรงรฃo com Neovim 0.8 e LSP)
-
Poll: how do you jump to Git conflict markers?
I use akinsho/git-conflict and it does its job: minimal and efficient.
- Let the IDE wars, uh, continue!
-
Git workflow
git-conflict that puts at your disposal straightforward interfaces to solve merge conflicts
-
Update: Diffview.nvim now has a merge tool!
It offers a number of preset layouts, including three variations on a 3-way diff layout, one 4-way diff layout as well as a one plain single window layout (for when you prefer editing the conflict markers manually without the visual noise from diffs, or you're using something like git-conflict.nvim).
- What git plugin is being used?
-
Which tools do you use for Git Conflicts?
Maybe give https://github.com/akinsho/git-conflict.nvim a try, another alternative could be fugitive by tpope iirc.
- what are the must have git plugs? in your opinion
What are some alternatives?
gh-i - ๐ search your github issues interactively
vim-conflicted - Easy git merge conflict resolution in Vim
gh-s - ๐ search github repositories interactively
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
gh-dash - A beautiful CLI dashboard for GitHub ๐
conflict-marker.vim - Weapon to fight against conflicts in Vim.
difftastic - a structural diff that understands syntax ๐ฅ๐ฉ
neogit - An interactive and powerful Git interface for Neovim, inspired by Magit
github-tui - TUI client for GitHub
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
fzf-preview.vim - The plugin that powerfully integrates fzf and (Neo)vim. It is also possible to integrate with coc.nvim.
lazygit.nvim - Plugin for calling lazygit from within neovim.