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

..

bisect_info.go

rename sha to hash 2

2024-04-12 08:33:47 +02:00

bisect.go

rename sha to hash 9, case: Sha

2024-04-12 08:33:47 +02:00

blame.go

Add command to find base commit for creating a fixup

2024-01-10 09:11:40 +01:00

branch_loader_test.go

Remove canUsePushTrack parameter of obtainBranches function

2025-04-09 10:40:52 +02:00

branch_loader.go

Remove canUsePushTrack parameter of obtainBranches function

2025-04-09 10:40:52 +02:00

branch_test.go

Allow deleting a range selection of branches

2024-12-01 10:59:54 +01:00

branch.go

Add '--' to 'git rev-list' to disambiguate branch name from path

2025-01-19 14:33:42 +01:00

commit_file_loader_test.go

Rename Name to Path in File and CommitFile

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

commit_file_loader.go

Rename Name to Path in File and CommitFile

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

commit_loader_test.go

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

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

commit_loader.go

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

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

commit_test.go

Commit without pre-commit hooks is independent on prefix

2025-03-22 11:04:28 +01:00

commit.go

Commit without pre-commit hooks is independent on prefix

2025-03-22 11:04:28 +01:00

common.go

Remove sync mutex

2023-10-08 18:45:36 +02:00

config.go

fix: Make tag operation use GPG helper to run signing in sub-process

2025-03-24 08:41:58 +01:00

custom.go

Add runCommand function to Go template syntax

2025-04-09 10:44:36 +02:00

deps_test.go

Remove unused functions

2025-03-03 21:23:29 +01:00

diff.go

Combine GetPathDiff and GetAllDiff into one command (GetDiff)

2025-01-07 17:46:51 +01:00

file_loader_test.go

Rename Name to Path in File and CommitFile

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

file_loader.go

Rename Name to Path in File and CommitFile

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

file_test.go

Support editing multiple files at once using range selection

2024-03-22 08:20:16 +01:00

file.go

Change direct access to Common.UserConfig to a getter

2024-08-18 10:24:52 +02:00

flow_test.go

Remove redundant variable dedeclarations

2024-05-19 16:38:21 +10:00

flow.go

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00

git_command_builder_test.go

Add worktree tests for removing/detaching

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

git_command_builder.go

Add worktree option to fast forwarding operation

2025-01-02 16:52:24 +11:00

main_branches.go

Re-determine existing main branches if mainBranches config changed

2024-08-18 10:24:52 +02:00

patch.go

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

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

rebase_test.go

Remove conditional code related to git earlier than 2.22

2025-04-09 10:40:52 +02:00

rebase.go

Remove conditional code related to git earlier than 2.22

2025-04-09 10:40:52 +02:00

reflog_commit_loader_test.go

Remove redundant variable dedeclarations

2024-05-19 16:38:21 +10:00

reflog_commit_loader.go

rename sha to hash 8, update some log and comment

2024-04-12 08:33:47 +02:00

remote_loader.go

Update to go 1.24

2025-03-08 14:53:54 -05:00

remote.go

Allow deleting a range selection of branches

2024-12-01 10:59:54 +01:00

repo_paths_test.go

Use filepath instead of path for file path operations

2024-08-18 10:24:52 +02:00

repo_paths.go

Use filepath instead of path for file path operations

2024-08-18 10:24:52 +02:00

stash_loader_test.go

Remove redundant variable dedeclarations

2024-05-19 16:38:21 +10:00

stash_loader.go

chore: use null char as a stash entries divider during loading

2023-12-27 11:21:49 +01:00

stash_test.go

Replace --include-untracked with -u in stash show command for compatibility and update failing tests

2025-02-22 08:17:38 +11:00

stash.go

Replace --include-untracked with -u in stash show command for compatibility and update failing tests

2025-02-22 08:17:38 +11:00

status.go

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

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

submodule.go

feat(submodules): add method to bulk init and update submodules

2025-03-22 09:54:32 +01:00

sync_test.go

Fix checking out a different branch while pushing a branch for the first time

2025-01-26 10:22:19 +01:00

sync.go

Fix checking out a different branch while pushing a branch for the first time

2025-01-26 10:22:19 +01:00

tag_loader_test.go

Remove redundant variable dedeclarations

2024-05-19 16:38:21 +10:00

tag_loader.go

Standardise on using lo for slice functions

2023-07-30 18:51:23 +10:00

tag.go

fix: Make tag operation use GPG helper to run signing in sub-process

2025-03-24 08:41:58 +01:00

version_test.go

Add a method GitVersion.IsAtLeast

2024-01-10 09:18:38 +01:00

version.go

Add a method GitVersion.IsAtLeast

2024-01-10 09:18:38 +01:00

working_tree_test.go

Rename Name to Path in File and CommitFile

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

working_tree.go

Escape special characters when git-ignoring files

2025-04-13 18:25:24 +10:00

worktree_loader_test.go

Remove redundant variable dedeclarations

2024-05-19 16:38:21 +10:00

worktree_loader.go

Remove redundant variable dedeclarations

2024-05-19 16:38:21 +10:00

worktree.go

Centralise logic for obtaining repo paths

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