3 ms·

Rebasing is a fundamental primitive, but not Git's implementation of interactive rebasing. I very much subscribe to a "patch-stack" workflow, but have a great

Rebasing is a fundamental primitive, but not Git's implementation of interactive rebasing. I very much subscribe to a "patch-stack" workflow, but have a great deal of difficulty doing advanced things in Git, because `git rebase`/`git rebase -i` do not support enough workflows. Here's some features I've implemented which improve on `git rebase` in general: https://github.com/arxanas/git-branchless/wiki/Command:-git-move#description https://github.com/arxanas/git-branchless/wiki/Command:-git-...

treis 4y ago
Really the fundamentals of git are nodes (commits) and how they connect to each other. Everything else is abstractions on that. Wonder if anyone has made a git client that lets you manipulate it at that level. Tree looking graph that allows you to drag connections to where you want them.
- btschaegg 4y ago
  > Wonder if anyone has made a git client that lets you manipulate it at that level. I believe you're describing GitUp [1]. I can't really say much about it, though, as I've never used it myself (because it's OSX only). [1]: https://gitup.co/ https://gitup.co/
  - treis 4y ago
    Yep that's what I was thinking of. Will have to give it a try.
  - password4321 4y ago
    I Ctrl+F'd for GitUp based on the title, it deserves mention here. It's all-in on Mac, unfortunately. https://github.com/git-up/GitUp https://github.com/git-up/GitUp > GitUp is built as a thin layer on top of a [Mac-only] reusable generic Git toolkit called "GitUpKit".
pama 4y ago
Is there any workflow in particular that you are missing in an Emacs/magit combo? I’ve found it easy to add a couple extra lines of lisp to fetch upstreams regularly or to “sync” worktrees in various remotes. The most complicated things I’ve encountered have been conflict resolutions, however, the tools did their best to help.

3 ms·

Rebasing is a fundamental primitive, but not Git's implementation of interactive rebasing. I very much subscribe to a "patch-stack" workflow, but have a great

by arxanas 4y ago

treis 4y ago
Really the fundamentals of git are nodes (commits) and how they connect to each other. Everything else is abstractions on that. Wonder if anyone has made a git client that lets you manipulate it at that level. Tree looking graph that allows you to drag connections to where you want them.
- btschaegg 4y ago
  > Wonder if anyone has made a git client that lets you manipulate it at that level. I believe you're describing GitUp [1]. I can't really say much about it, though, as I've never used it myself (because it's OSX only). [1]: https://gitup.co/ https://gitup.co/
  - treis 4y ago
    Yep that's what I was thinking of. Will have to give it a try.
  - password4321 4y ago
    I Ctrl+F'd for GitUp based on the title, it deserves mention here. It's all-in on Mac, unfortunately. https://github.com/git-up/GitUp https://github.com/git-up/GitUp > GitUp is built as a thin layer on top of a [Mac-only] reusable generic Git toolkit called "GitUpKit".
pama 4y ago
Is there any workflow in particular that you are missing in an Emacs/magit combo? I’ve found it easy to add a couple extra lines of lisp to fetch upstreams regularly or to “sync” worktrees in various remotes. The most complicated things I’ve encountered have been conflict resolutions, however, the tools did their best to help.