4 ms·

I’ve always wanted a git with five commands, and maybe with AST based diffing

• simcop2387 4mo ago
  The five command part isn't really possible but you can use custom diffs for merges, git diff, etc. pretty easily. There are projects like diffsitter ( https://github.com/afnanenayet/diffsitter https://github.com/afnanenayet/diffsitter ) for doing more intelligent diffs like this for supported languages. EDIT: and then an example for the merge stuff I couldn't find while typing before: https://mergiraf.org/ https://mergiraf.org/ and HN discussion a few years ago: https://news.ycombinator.com/item?id=42093756 https://news.ycombinator.com/item?id=42093756
  • frollogaston 4mo ago
    clone, pull, push, branch, merge, add, commit are the ones I use, but that's 7
    • deleted 4mo ago
      [deleted]
    • xboxnolifes 4mo ago
      checkout, log, config?
      • nailer 4mo ago
        And reflog when you make a mistake.
    • feelamee 4mo ago
      fetch, rebase, blame?
      • frollogaston 4mo ago
        I intentionally avoid fetch and rebase because you can pull and merge instead
  • gritzko 4mo ago
    Five is enough. Beagle uses five HTTP verbs: GET, POST, PUT, DELETE, PATCH. And it is syntax-aware. https://replicated.wiki/blog/uris.html https://replicated.wiki/blog/uris.html
• pushcx 4mo ago
  I had wanted the same thing for a long time and jj + difftastic has satisfied me.
  • feelamee 4mo ago
    How does jj handle problems described in the lore website? I'm curious. I thought jj didn't have any goals about large binary files