tnesbitt210

That's one of the top things on my TODO list! Have a couple other bugfixes first, but expect this as a feature within a month or so.

It finds all local branches (plus the HEAD commit) where

1. The branch isn't following a remote branch that's been deleted (which often happens after merging or deleting a pull request).

2. The branch has a common commit with the primary remote branch (usually origin/main or origin/master) from the last 2 weeks. You can see older commits & branches by clicking “load more commits.”

Then, it displays all the commits from the top of that branch down to where it joins with the main branch.

If the HEAD commit meets the primary branch at a commit more than 2 weeks old, then the 2 week range is extended (for all branches) as well.

Pushed a fix for #2 in v0.0.41!

Git graph is great, and is something I've used in my workflow. But here's a few features of Interactive Smartlog (ISL) that may make it stand out:

- In ISL, your uncommitted changes are highlighted as a key part of the UI, and you can perform git actions on your uncommitted changes (staging/unstaging, reverting, etc)

- ISL aims to present a minimalist view of your repository, with only commits and branches that are relevant to your work.

- You can view pull request status via ISL (accepted/rejected/needs-review, # of comments, CI status).

- ISL aims to never send you to the command line. When you rebase, for example, you can perform all actions entirely within the UI (though you may need to go into files for conflict resolution).

- ISL encourages usage of the UI for git operations: git actions appear as buttons in the UI (whereas in Git Graph, they appear via a context menu when you right-click on a commit)

- You can easily create & amend commits, and push branches in ISL via buttons in the UI.

Hope this helps! Let me know if I can answer any other questions :)

Thanks for the report!

#2 definitely sounds like a bug - I’ll look into that!

#1 - Rebasing should definitely be possible, but only when A) the commit you’re rebasing onto is not a descendent of the one you’re currently on, and vice versa and B) The target commit should either be on the primary branch (usually origin/main or origin/master) or have branched off from the primary branch at the same point or later than the commit you’re currently on does. This condition isn’t strictly necessary, but the thinking is that usually people want to rebase onto the commit that’s further ahead.

For any commit where these conditions are met , a rebase icon-button should appear when you hover over that commit, to its right.

Let me know if you’re still having trouble, or if you have any follow up UX feedback!