Stefan Haller 3928d0ebda Insert fake todo entry for a conflicting commit that is being applied ...

When stopping in a rebase because of a conflict, it is nice to see the commit
that git is trying to apply. Create a fake todo entry labelled "conflict" for
this, and show the "<-- YOU ARE HERE ---" string for that one (in red) instead
of for the real current head.

2023-06-22 18:57:58 +02:00

..

context

Refresh commits viewport on focus lost

2023-06-01 21:31:57 +10:00

controllers

Insert fake todo entry for a conflicting commit that is being applied

2023-06-22 18:57:58 +02:00

filetree

fix could-not-access error

2022-11-12 18:09:15 -03:30

keybindings

Use same labels for keys that we use in the config

2023-05-21 10:59:16 +10:00

mergeconflicts

migrate patch building tests

2023-02-25 21:37:16 +11:00

modes

refactor cherry pick code to move state access out of helper

2023-04-30 13:19:53 +10:00

patch_exploring

refactor patch code

2023-03-19 16:30:39 +11:00

popup

lots of changes

2023-04-30 13:19:53 +10:00

presentation

Insert fake todo entry for a conflicting commit that is being applied

2023-06-22 18:57:58 +02:00

services/custom_commands

Support authors and tags in custom command suggestions preset

2023-06-07 10:18:01 +10:00

status

lots of changes

2023-04-30 13:19:53 +10:00

style

Stop hiding underscores for VSCode

2023-06-01 20:12:20 +10:00

types

Visualize the "ignore whitespace" state in the subtitle of the diff view

2023-05-20 12:58:32 +10:00

background.go

Begin refactoring gui

2023-04-30 13:19:52 +10:00

command_log_panel.go

Show correct keybinding in tip

2023-05-20 23:36:34 +10:00

context_config.go

move some methods

2023-04-30 13:19:53 +10:00

context.go

Don't deactivate context that you're about to activate

2023-05-16 21:01:38 +10:00

controllers.go

Split commit message panel into commit summary and commit description panel

2023-04-30 13:19:53 +10:00

dummies.go

feat: add GitVersion struct

2022-12-30 20:01:14 +09:00

editors.go

Split commit message panel into commit summary and commit description panel

2023-04-30 13:19:53 +10:00

extras_panel.go

Appease linter

2023-06-03 15:54:03 +10:00

file_watching.go

Begin refactoring gui

2023-04-30 13:19:52 +10:00

global_handlers.go

Use sentence case everywhere

2023-05-25 23:52:19 +10:00

gui_common.go

remove duplicate method

2023-05-11 19:00:41 +10:00

gui_driver.go

Rename CmdLog -> GuiLog

2023-05-16 21:01:38 +10:00

gui.go

Add nerdFontsVersion config

2023-06-15 21:47:52 +02:00

information_panel.go

lots of changes

2023-04-30 13:19:53 +10:00

keybindings.go

Use sentence case everywhere

2023-05-25 23:52:19 +10:00

layout.go

Fix focus issue when opening recent-repos menu at launch

2023-06-07 18:27:18 +10:00

main_panels.go

Visualize the "ignore whitespace" state in the subtitle of the diff view

2023-05-20 12:58:32 +10:00

menu_panel.go

Use sentence case everywhere

2023-05-25 23:52:19 +10:00

options_map.go

Use sentence case everywhere

2023-05-25 23:52:19 +10:00

pty_windows.go

Format code to pass lint

2021-09-16 21:38:43 +08:00

pty.go

Make sure scrollbars have the right size initially

2023-03-21 18:26:18 +01:00

recent_repos_panel.go

Begin refactoring gui

2023-04-30 13:19:52 +10:00

searching.go

Use sentence case everywhere

2023-05-25 23:52:19 +10:00

tasks_adapter.go

Begin refactoring gui

2023-04-30 13:19:52 +10:00

test_mode.go

remove old integration test recording code

2023-03-24 18:42:11 +11:00

view_helpers.go

lots more refactoring

2023-04-30 13:19:53 +10:00

views.go

Use sentence case everywhere

2023-05-25 23:52:19 +10:00