Stefan Haller ff465e2581 Show original todo action instead of "conflict", and show <-- CONFLICT instead ...

It is useful to see if the conflicted commit was a "pick" or an "edit". What's
more, we're about to add support for showing cherry-picks and reverts, and
seeing that a conflicted commit was a revert is important because its diff is
backwards compared to the diff of the conflicting files in the Files panel.

2025-04-20 15:55:44 +02:00

..

author.go

Keep track of authors across local commits and branch commits for suggestions

2023-07-22 10:47:04 +10:00

branch.go

Add ShortRefName to Ref interface

2024-08-28 18:27:52 +02:00

commit_file.go

Rename Name to Path in File and CommitFile

2025-03-20 12:31:34 +01:00

commit.go

Show original todo action instead of "conflict", and show <-- CONFLICT instead

2025-04-20 15:55:44 +02:00

file.go

Better main view display for conflicing files

2025-04-09 10:27:57 +02:00

remote_branch.go

Add ShortRefName to Ref interface

2024-08-28 18:27:52 +02:00

remote.go

Use inline status for fetching remotes

2024-01-26 08:29:04 +01:00

stash_entry.go

Add ShortRefName to Ref interface

2024-08-28 18:27:52 +02:00

submodule_config.go

Show all submodules recursively

2024-03-07 20:16:28 +01:00

tag.go

Add ShortRefName to Ref interface

2024-08-28 18:27:52 +02:00

working_tree_state.go

Make WorkingTreeState a struct, and add cherry-picking and reverting states

2025-04-20 15:53:17 +02:00

worktree.go

Use fields rather than methods on worktrees

2023-07-30 18:35:24 +10:00