mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-03-03 15:02:52 +02:00
ff8bc91a8e
This solves three problems: 1. When the local main branch is behind its upstream, the merged status of commits of a feature branch sitting on origin/main was not correct. This can easily happen when you rebase a branch onto origin/main instead of main, and don't bother keeping local main up to date. 2. It works when you don't have the main branch locally at all. This could happen when you check out a colleague's feature branch that goes off of "develop", but you don't have "develop" locally yourself because you normally only work on "main". 3. It also works when you work on a main branch itself, e.g. by committing to it directly, or by merging a branch locally. These local commits on a main branch would previously be shown in green instead of red; this broke with 910a61dc46.