git-branchless
neogit
Our great sponsors
git-branchless | neogit | |
---|---|---|
55 | 54 | |
3,306 | 3,264 | |
- | 9.4% | |
9.4 | 9.9 | |
5 days ago | 6 days ago | |
Rust | Lua | |
Apache License 2.0 | 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.
git-branchless
-
Ask HN: Can we do better than Git for version control?
Yes, but due to its simplicity + extensibility + widespread adoption, I wouldn’t be surprised if we’re still using Git 100+ years from now.
The current trend (most popular and IMO likely to succeed) is to make tools (“layers”) which work on top of Git, like more intuitive UI/patterns (https://github.com/jesseduffield/lazygit, https://github.com/arxanas/git-branchless) and smart merge resolvers (https://github.com/Symbolk/IntelliMerge, https://docs.plasticscm.com/semanticmerge/how-to-configure/s...). Git it so flexible, even things that it handles terribly by default, it handles
- Meta developer tools: Working at scale
- Show HN: Gut – An easy-to-use CLI for Git
-
Branchless Workflow for Git
> Is this for a case where a bunch of people branch from master@HEAD (lets call this A), then you need to modify A, so you then need to rebase each branch that branched from A individually?
Mainly it's for when you branch from A multiple times, and then modify A. This can happen if you have some base work that you build multiple features on top of. I routinely do this as part of rapid prototyping, as described here: https://github.com/arxanas/git-branchless/wiki/Workflow:-div...
`git undo` shows a list of operations it'll execute, which you have to confirm before accepting. Of course, it's ultimately a matter of trust in the tools you use.
- Where are my Git UI features from the future?
- git-branchless: High-velocity, monorepo-scale workflow for Git
- git-branchless
-
Show HN: Maiao, Stacked Diffs for GitHub
What happens is you work somewhere that has stacked diffs and suddenly you learn how to shape your diffs to make them easy to review. Thinking of how folks will review your code in chunks while writing it makes it cleaner. Having small but easy to read diffs makes reviews faster and helps junior devs learn how to review.
Sometimes this doesn’t happen in which case you end up need to split your commit at the end. This is where git utterly fails. You end up needing git split and git absorb to make this productive.
Git split let’s you select which chunks in a commit should belong to it and then splits that into a commit and then you do it again and again until you have lots of commits. You’ll still need to probably test each one but the majority of the work is done
Git absorb takes changes on the top of your stack and magically finds which commit in your stack the each chunk should belong to and amends it to the right commit
You also need git branchless https://github.com/arxanas/git-branchless as it lets you move up and down the stack without needing to remember so much git arcana.
- High velocity, monorepo-scale workflow for Git
neogit
-
Neovim: creating keymaps in lua
I would use this feature of lazy.nvim in a plugin that I rarely need. Something neogit for example. I can spend hours coding without using it. In that particular case I think is nice to have the option to load it when I actually call it.
-
GitUI
This looks very much like the Noevim plugin I began using about a month ago: neogit[0].
The keybindings were a bit rough, and it took me about an hour of use before I was really comfortable with the overall workflow. Once I was, though, I’ve found it to be much faster than my previous workflow (suspending neovim and using git directly in the shell).
0: https://github.com/NeogitOrg/neogit
-
Is there a discard all option in neogit?
Edit: FYI: I made a feature request and got the answer, that it it possible to visually select the files and discard them like this together.
- Massive Update to Neogit and New Home!
-
What IDEA or Vscode feature/function you want to have in neovim eco-system?
This is what I use for general git interaction and it‘s pretty neat: neogit. Also integrates diffview
-
Magit
For neovim users, there's a work-in-progress clone, neogit: https://github.com/timUntersberger/neogit/
Some of my colleagues use emacs/magit, and after seeing how absolutely lovely the workflow is, I've put in a lot of work over the last few months expanding it. You can check out my fork here: https://github.com/ckolkey/neogit/
One thing I particularly like to tease my emacs' colleagues about is that my magit is faster than theirs thanks to neovim's async capabilities.
- Your favourite Neovim plugins?
-
What do you use for git integration in neovim?
You could use neogit (https://github.com/TimUntersberger/neogit) for basic commands however I have found it's easier / more versatile to just use lazygit in either another tmux tmux window or within neovim itself.
-
Switching from Emacs. My experience
The only thing I truly miss from Emacs is [Magit](https://magit.vc/) since I still consider it the best git wrapper available. It is just too good. Unfortunately [Neogit](https://github.com/TimUntersberger/neogit) is not quite there yet although I hope it makes it at some point. I didn't like [Fugitive]https://github.com/tpope/vim-fugitive), but I ended up finding a good enough workaround by using [Lazygit](https://github.com/jesseduffield/lazygit) through [Toggleterm](https://github.com/akinsho/toggleterm.nvim).
- Neovim vs VSCode Neovim - what are the tradeoffs?
What are some alternatives?
graphite-cli - Graphite's CLI makes creating and submitting stacked changes easy.
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
jj - A Git-compatible VCS that is both simple and powerful
lazygit.nvim - Plugin for calling lazygit from within neovim.
magit - It's Magit! A Git Porcelain inside Emacs.
octo.nvim - Edit and review GitHub issues and pull requests from the comfort of your favorite editor
vimagit - Ease your git workflow within Vim
lazygit - simple terminal UI for git commands
difftastic - a structural diff that understands syntax 🟥🟩
libgit2 - A cross-platform, linkable library implementation of Git that you can use in your application.
gitsigns.nvim - Git integration for buffers