Commit graph

30 commits

Author SHA1 Message Date
Jesse Duffield 79a72fe7a6 refactor 2022-09-22 09:03:11 -07:00
Yuki Osaki 93bbea1221 fix layout 2022-08-19 12:18:35 +09:00
Yuki Osaki f277ea2350 fix conflict 2022-08-16 22:07:42 +09:00
Yuki Osaki 4a31f3fd50 Merge branch 'master' into gh-integration 2022-08-14 20:48:42 +09:00
Ryooooooga 11d0e7e17d
feat(gui): show branch icons 2022-04-23 12:25:41 +09:00
Jesse Duffield dfb293c985 better upstream changes presentation 2022-04-18 11:03:28 +10:00
Jesse Duffield 1b75ed3740 many more generics 2022-03-24 20:14:41 +11:00
Jesse Duffield dde30fa104 add gone branches status 2022-03-24 17:50:25 +11:00
Yuki Osaki c3d2722cb8 fix conflicts 2022-02-25 11:50:59 +09:00
Yuki Osaki ed4e7ac960 Merge branch 'master' into gh-integration 2022-02-25 09:01:03 +09:00
Matt Cles 9adf4a1908 Add shared function for loading map of custom colors 2022-02-01 18:55:45 +11:00
Matt Cles 4df7646654 Add configurable colors for branch prefixes
Branches can now be colored based on their prefix, if it matches
a user defined prefix in the config file. If no user defined
prefix matches, then it will fallback to the defaults: green for
'feature', yellow for 'bugfix', and red for 'hotfix'. All
remaining branches will be set to the default text color.
2022-02-01 18:55:45 +11:00
Jesse Duffield 1c84f77319 always specify upstream when pushing/pulling 2022-01-15 15:34:01 +11:00
Yuki Osaki bf355bc0b5 fix based on the reviews 2021-11-10 00:19:39 +09:00
Yuki Osaki d2e75a6359 remove BranchesWithGithubPullRequests check 2021-10-31 23:31:05 +09:00
Yuki Osaki aed7c29509 move pr color logic to own method 2021-10-31 22:40:39 +09:00
Yuki Osaki 502c23dff7 update the logic 2021-10-31 13:58:07 +09:00
Yuki Osaki a71db3355a update it not to inject the PRs into our branches 2021-10-30 00:37:38 +09:00
Yuki Osaki ada3b528d3 fix conflict 2021-10-29 20:29:41 +09:00
Yuki Osaki 3df068b1fc Merge branch 'master' into gh-integration 2021-10-29 19:19:43 +09:00
Jesse Duffield d626bcac00 color fixups 2021-08-01 16:14:56 +10:00
mjarkk 79848087bc Switch to github.com/gookit/color for terminal colors 2021-07-30 15:14:46 +02:00
mjarkk c295deaa81 show github pr number in branches list 2021-07-29 12:14:22 +02:00
Jesse Duffield 9fdf92b226 more refactoring
WIP

WIP
2021-06-06 09:12:49 +10:00
Jesse Duffield ce6f8ed1bc move models folder into commands folder 2020-09-29 20:48:49 +10:00
Jesse Duffield 44248d9ab0 pull branch model out into models package 2020-09-29 20:48:49 +10:00
Jesse Duffield 40fbce91ce add new diff mode
WIP

WIP

WIP

WIP

WIP

WIP

WIP
2020-03-29 18:26:24 +11:00
Jesse Duffield d027cf969c better handling of current branch name 2020-03-26 20:37:06 +11:00
Jesse Duffield 1be0ff8da7 better upstream tracking and allow renaming a branch 2020-03-18 21:29:06 +11:00
Jesse Duffield f94d0be2c9 refactor the way we render lists 2020-02-25 21:21:07 +11:00