Scott Chacon
Scott Chacon
Oh sorry, I missed that. Yeah, that could work. Though, can we do a mockup where we have "merge upstream" directly under the upstream group and "push to remote" under...
Something like this (sorry for the horrible photoshop):  We should always group these together, and it seems a bit clearer that there is an...
btw, I really like this where it is a single line, but it bends for the local ones:  It's a nice way to visually...
Divergence in this case is the only correct way to show it. What might be valuable is to show a partial sha in these cases (or maybe even generally?)
maybe if we can match on identical message (or we could be spiffy and extract a patch-id from each, but there are corner cases that fuck both of those approaches...
> Btw, what is a partial sha? Just showing the first 6-8 chars, rather than all 40 chars.
@krlvi is there a way to get the GitButler version in TS?
Nevermind, figured it out.
Now that I think about this, I remember another reason why we did this. I don't want people to check out the gitbutler branches directly and do work on them....
In that case, I suppose we could watch for updates to these refs and then just update both the `tree` and `head` entries in the associated virtual branch while we're...