| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2024-01-19 | Standardise display of range selection across views | Jesse Duffield | |
| We're not fully standardising here: different contexts can store their range state however they like. What we are standardising on is that now the view is always responsible for highlighting the selected lines, meaning the context/controller needs to tell the view where the range start is. Two convenient benefits from this change: 1) we no longer need bespoke code in integration tests for asserting on selected lines because we can just ask the view 2) line selection in staging/patch-building/merge-conflicts views now look the same as in list views i.e. the highlight applies to the whole line (including trailing space) I also noticed a bug with merge conflicts not rendering the selection on focus though I suspect it wasn't a bug with any real consequences when the view wasn't displaying the selection. I'm going to scrap the selectedRangeBgColor config and just let it use the single line background color. Hopefully nobody cares, but there's really no need for an extra config. | |||
| 2023-02-25 | migrate patch building tests | Jesse Duffield | |
| 2022-08-07 | move merge conflicts code into controller | Jesse Duffield | |
| 2022-05-07 | more documentation | Jesse Duffield | |
| 2022-04-06 | feat(merge_panel): Add open/edit files in merge conflict panel | Ryooooooga | |
| 2022-03-19 | update linters | Jesse Duffield | |
| 2022-03-17 | move more view model logic into the files view model | Jesse Duffield | |
| 2022-01-27 | better locking of merge panel state | Jesse Duffield | |
| 2022-01-26 | improve merge conflict flow | Jesse Duffield | |
| 2021-08-25 | Address feedback | Jesse Duffield | |
| 2021-08-25 | Minor refactor | Jesse Duffield | |
| 2021-08-25 | Fix `pick all hunks` | Ryooooooga | |
| 2021-08-25 | simplify merge panel logic | Ryooooooga | |
| 2021-08-25 | add mergeConflict#hasAncestor | Ryooooooga | |
| 2021-08-25 | Fix conflict resolution | Ryooooooga | |
| 2021-08-25 | Support `git config merge.conflictStyle diff3` | Ryooooooga | |
| 2021-08-21 | Fix panic in merge conflict | Ryooooooga | |
| 2021-08-01 | color fixups | Jesse Duffield | |
| 2021-07-31 | simplify code a bit | Jesse Duffield | |
| 2021-07-30 | Switch to github.com/gookit/color for terminal colors | mjarkk | |
| 2021-06-05 | prevent closure issue | Jesse Duffield | |
| 2021-06-05 | not importing regexp | Jesse Duffield | |
| 2021-06-05 | more explicit | Jesse Duffield | |
| 2021-06-05 | Discard value after END marker | Cristian Betivu | |
| 2021-06-05 | More generic merge conflict detection | Cristian Betivu | |
| 2021-06-02 | refactor | Jesse Duffield | |
| 2021-05-30 | Handle alternate merge conflict format; add tests | Harrison Jones | |
| 2021-04-18 | refactor merge panel | Jesse Duffield | |
| 2021-04-02 | refactor | Jesse Duffield | |
 |
index : lazygit | |
| Mirror of https://github.com/jesseduffield/lazygit | matthias |
| summaryrefslogtreecommitdiffstats |