forgit VS jj

i don't like tuis that much (other than for editing text, i mean), but i also really don't like git's command line interface.

so i've been using forgit, which basically adds a really nice fzf interface for git. it really fits the way i work within a terminal (i'm a heavy fzf user).

https://github.com/wfxr/forgit

Seems like (maybe) it’s a NeoVim integration of this tool

So it is like https://github.com/wfxr/forgit only that instead of a command you can use shortcut in your terminal emulator, right?

Well, what if I told you there are tools that can improve this significantly. We are going to be looking at 2 tools today, forgit and lazygit. Both of these tools let us do many of our day-to-day git tasks, interactively and come with a LOT of keyboard shortcuts.

No, they're not.

`gcp` and `ga` are part of forgit, not OPs config. That's why searching the repo didn't find anything. I assumed they were part of OPs linked repo.

`gcp` https://github.com/wfxr/forgit/search?q=gcp

`ga` https://github.com/wfxr/forgit/search?q=ga

git Work with git. Switch branches, search history with diffs viewing, interactive rebase and more.

forgit 🥇 🏃‍♂️ ⏳ - Utility tool for git which takes advantage of fuzzy finder fzf.

And while reading through the wiki, I found forgit, a Utility tool for using git interactively. Powered by junegunn/fzf. I favor Emacs 🔍’s amazing magit package for most git interactions. But forgit’s interactive log viewer provides functionality that I haven’t found in Magit 🔍.

Jujutsu is along the lines of what you describe: https://github.com/martinvonz/jj

You can drop it in and work seamlessly from git repos

> There are two interesting contenders worthy of mention: Pijul [and] Fossil

Also might be worthy to mention Jujitsu [0], a vcs out of Google with a git-compatible backend and more ergonomic interface [1].

[0]: https://github.com/martinvonz/jj

[1]: What if we could replace Git, Jujutsu might give us a shot https://v5.chriskrycho.com/essays/jj-init/

Pull Requests (or Merge Requests) are merged only when (1) all of the automated tests pass; and (2) enough necessary reviewers have indicated approval.

Git doesn't tell you when it's necessary to have full test coverage and manual infosec review in development cycles that produce releases, and neither do Pull Requests.

https://westurner.github.io/hnlog/#comment-19552164 ctrl-f hubflow

It looks like datasift's gitflow/hubflow docs are 404'ing, but the original nvie blog post [1] has the Git branching workflow diagrams; which the wpsharks/hubflow fork [3] of datasift/gitflow fork [2] of gitflow [1]has a copy of in the README:

[1] https://github.com/nvie/gitflow

[2] https://github.com/datasift/gitflow

[3] https://github.com/wpsharks/hubflow?tab=readme-ov-file

https://learngitbranching.js.org/ is still a great resource, and it could work on mobile devices.

The math of VCS deltas and mutable and immutable content-addressed DAG nodes identified by 2^n bits describing repo/$((2*inf)) bits ;

>> "ugit – Learn Git Internals by Building Git in Python" https://www.leshenko.net/p/ugit/

SLSA.dev is a social construct atop e.g. git, which is really a low-level purpose-built tool and Perl and now Python porcelain.

jj (jujutsu) is a git-compatible VCS CLI: https://github.com/martinvonz/jj

"Ask HN: Best Git workflow for small teams" (2016)

You will probably like Jujutsu, which takes much inspiration from Mercurial: https://github.com/martinvonz/jj

It isn't a 1-to-1 clone, either. But tools like revsets are there, cset evolution is "built in" to the design, etc. There is no concept of phases, we might think about adding that, but there is a concept of immutable commits (so you don't overwrite public ones.)

It also has many novel features that make it stand out. We care a lot about performance and usability. Give it a shot. I think you might be pleasantly surprised.

Disclosure: I am a developer of Jujutsu. I do it in my spare time.

I have created a discussion. Thank you both

https://github.com/martinvonz/jj/discussions/2691

yep both extended it and have versions that can work against GitHub/git servers.

sapling scm from meta has I think the best cli and VS code UX https://sapling-scm.com/

jj from google is also mercurial derived with very similar cli features like histedit and has support for deferring conflict resolution https://github.com/martinvonz/jj

https://github.com/martinvonz/jj a more recent version control system.

Google currently uses a fork of Mercurial as the frontend to Piper, but there is work to replace it wholesale, eventually: https://github.com/martinvonz/jj

(As a disclosure, I'm involved with and contribute to jj, but I don't work for or speak for Google in any way; the above statement is public knowledge.)