1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-10 04:07:18 +02:00
lazygit/pkg
Stefan Haller 910a61dc46 Make "merged" take precedence over "unpushed"
Previously, when rebasing a branch onto a newer master, all commits from the
previous fork point up to its head were marked red (unpushed), including the
commits that are on master already. While this is technically correct from the
perspective of the current branch's upstream, it's not what most people expect,
intuitively; they want to see where the current branch starts, relative to
master. So all commits of master should be green, and then the commits of the
current branch in red.
2023-05-12 22:56:58 +02:00
..
app merge master into refactor-better-encapsulation 2023-05-02 19:05:42 +10:00
cheatsheet Split commit message panel into commit summary and commit description panel 2023-04-30 13:19:53 +10:00
commands Make "merged" take precedence over "unpushed" 2023-05-12 22:56:58 +02:00
common introduce Common struct for passing around common stuff 2022-01-04 09:07:15 +11:00
config add comment to encourage keeping code and docs in sync 2023-05-04 16:53:13 +10:00
constants update release notes 2021-04-20 18:34:47 +10:00
env clearer separation of concerns when bootstrapping application 2022-05-07 16:02:04 +10:00
fakes cleanup integration test code 2023-02-26 12:54:13 +11:00
gui remove duplicate method 2023-05-11 19:00:41 +10:00
i18n Split commit message panel into commit summary and commit description panel 2023-04-30 13:19:53 +10:00
integration Merge branch 'master' into refactor-better-encapsulation 2023-05-11 19:00:01 +10:00
logs clearer separation of concerns when bootstrapping application 2022-05-07 16:02:04 +10:00
secureexec Format code to pass lint 2021-09-16 21:38:43 +08:00
snake integrate snake game into lazygit 2022-12-30 12:18:59 +11:00
tasks prevent unnecessary re-renders of view 2023-04-02 15:44:05 +10:00
theme Fix setting gui.selectedRangeBgColor as a hex value 2023-03-03 08:46:43 +01:00
updates Begin refactoring gui 2023-04-30 13:19:52 +10:00
utils add ability to update yaml path while preserving comments 2023-05-10 22:31:27 +10:00