Commit graph

  • 6b6d881624 Add test to check that an "edit" entry correctly shows a conflict Stefan Haller 2024-06-14 14:52:20 +02:00
  • bb4d03db1f Show todos (and conflicting commit) for cherry-pick and revert Stefan Haller 2024-06-11 15:22:35 +02:00
  • 687bae48ed Simplify the MergeRebasingCommits call in GetCommits (slightly) Stefan Haller 2024-06-11 14:45:51 +02:00
  • ff465e2581 Show original todo action instead of "conflict", and show <-- CONFLICT instead Stefan Haller 2024-06-13 16:55:20 +02:00
  • 9c8f987934 Use commit.IsTODO instead of comparing Status against models.StatusRebasing Stefan Haller 2025-04-05 10:48:32 +02:00
  • d84ee606e8 Remove unused enum entry StatusSelected Stefan Haller 2024-06-13 15:16:40 +02:00
  • 3dc045b69c
    Continue/abort a conflicted cherry-pick or revert (#4441) Stefan Haller 2025-04-20 15:55:11 +02:00
  • 90db796f42 Add DisabledReason for rebase options when not rebasing or merging Stefan Haller 2024-06-11 13:37:55 +02:00
  • 3e5024480d Check for conflicts after reverting a commit Stefan Haller 2025-03-30 21:24:40 +02:00
  • 4b3262ab3e Add test for reverting a commit that conflicts Stefan Haller 2025-03-30 21:20:40 +02:00
  • 362678e2ef Mention which command is continued in PromptToContinueRebase Stefan Haller 2024-06-12 14:45:45 +02:00
  • 542525743c Make WorkingTreeState a struct, and add cherry-picking and reverting states Stefan Haller 2024-06-10 17:54:04 +02:00
  • 8af8f7754b Move types/enums/enums.go to working_tree_state.go Stefan Haller 2025-04-07 10:44:11 +02:00
  • e1eb95b2b3 Add test for a special situation in rebases involving empty commits Stefan Haller 2025-03-31 19:21:40 +02:00
  • b210b4363d Centralize logic regarding WorkingTreeState close to its definition Stefan Haller 2024-06-11 12:05:42 +02:00
  • cd36e95a82 Rename RebaseMode to WorkingTreeState Stefan Haller 2024-06-10 17:36:34 +02:00
  • 1a73697546 Simplify the RebaseMode enum Stefan Haller 2024-06-10 16:52:02 +02:00
  • 37f835244d Use WorkingTreeState instead of RebaseMode in CommitLoader Stefan Haller 2024-06-11 14:20:32 +02:00
  • 94fc4d7eb4 Remove rebaseMode field from TestGetCommits scenario Stefan Haller 2024-06-10 16:22:50 +02:00
  • 682e54222c Don't wait for debugger in daemon mode Stefan Haller 2024-06-14 17:21:34 +02:00
  • 89ba3f2b1a
    Fix truncation of branches when scrolling branches panel to the left (#4483) Stefan Haller 2025-04-20 15:52:20 +02:00
  • fa9d75835c Rerender views if necessary when scrolling horizontally Stefan Haller 2025-04-12 19:47:11 +02:00
  • 9e3e1a7b3a Fix truncating branches to the right edge of the view when scrolled to the left Stefan Haller 2025-04-12 19:46:14 +02:00
  • 0236682882
    README.md: Update Sponsors (#4281) Jesse Duffield 2025-04-20 18:24:21 +10:00
  • f1b20e3823
    feat: enable toggling between dobule dot and triple dot Yuki-bun 2025-04-20 00:35:15 +09:00
  • cccd5f90e2 When creating a new branch off of a main branch that is behind its upstream, use the upstream instead Stefan Haller 2025-04-16 18:07:01 +02:00
  • 058699cb71 README.md: Update Sponsors github-actions[bot] 2025-04-14 08:28:01 +00:00
  • 5f809809dd
    Skip date check when release worfklow is manually invoked (#4484) v0.49.0 Jesse Duffield 2025-04-14 18:27:49 +10:00
  • f7eb9113f3 Skip date check when release worfklow is manually invoked Jesse Duffield 2025-04-14 18:24:45 +10:00
  • d68c116387
    Escape special characters in filenames when git-ignoring files (#4475) Jesse Duffield 2025-04-13 18:31:23 +10:00
  • b0ab6529c1 Escape special characters when git-ignoring files Stefan Haller 2025-04-09 13:27:44 +02:00
  • 41f89d86f0 Add test that shows problems with git-ignoring files with special characters Stefan Haller 2025-04-09 13:21:26 +02:00
  • d70a405169
    Fix crash with drag selecting and staging (#4480) Jesse Duffield 2025-04-13 18:25:09 +10:00
  • 29614a83e6
    Merge 6fbd99a127 into 61636d820c Stefan Haller 2025-04-13 07:42:57 +02:00
  • 74457305f1 chore: fix function name in comment riyueguang 2025-04-12 09:54:44 +08:00
  • 825e5c23c1 Fix crash when dragging from below the end of the diff upwards and then staging the range Stefan Haller 2025-04-11 10:14:04 +02:00
  • a3ae1c8e4d Refactor: extract function clampLineIdx Stefan Haller 2025-04-11 10:11:42 +02:00
  • 61636d820c
    Update translation files from Crowdin (#4473) Stefan Haller 2025-04-10 11:42:41 +02:00
  • 204f6c7edb Update translation files from crowdin Stefan Haller 2025-04-10 09:16:40 +02:00
  • 1106b67f20
    fix: update vscode color to logo color (#4459) Stefan Haller 2025-04-10 09:58:08 +02:00
  • 93899b82fa fix: update vscode color to logo color Peter Cardenas 2025-04-04 01:53:45 -07:00
  • 12fa50a61c
    Add a command to select all commits of the current branch (#4448) Stefan Haller 2025-04-10 09:05:55 +02:00
  • 80b5e21bd5 Add a command to select all commits of the current branch Stefan Haller 2025-04-01 09:05:45 +02:00
  • 7bccf848af
    Show "(hooks disabled)" in title bar of commit message editor (#4467) Stefan Haller 2025-04-10 08:59:55 +02:00
  • b3bffbec4a Show "hooks disabled" in title bar of commit message editor Stefan Haller 2025-04-07 19:53:16 +02:00
  • 2ee80d7150 Cleanup: don't render the commit length when typing in the description Stefan Haller 2025-04-07 19:35:54 +02:00
  • a24189ba63
    Prefill the commit subject with the skipHook prefix when pressing w (#4456) Stefan Haller 2025-04-10 08:54:46 +02:00
  • ced70903ec Prefill the commit subject with the skipHook prefix when pressing w Stefan Haller 2025-04-03 15:04:52 +02:00
  • 391654984b
    Bump go-git, and get rid of github.com/imdario/mergo (#4460) Stefan Haller 2025-04-09 11:26:30 +02:00
  • b78aa54439 Use dario.cat/mergo instead of github.com/imdario/mergo Stefan Haller 2025-04-04 16:18:12 +02:00
  • 4cf49ff449 Bump go-git Stefan Haller 2025-04-09 10:38:46 +02:00
  • da0105c16b
    Add runCommand function to Go template syntax + add support for templates in git branchPrefix setting (#4438) Stefan Haller 2025-04-09 11:11:07 +02:00
  • 12820481e6 Add runCommand function to Go template syntax Ruud Kamphuis 2025-03-31 15:21:44 +02:00
  • c7feba9bb1 Move test from commit to branch Ruud Kamphuis 2025-04-04 08:12:20 +02:00
  • e127a928fe
    Bump the minimum required git version to 2.22 (#4439) Stefan Haller 2025-04-09 10:43:31 +02:00
  • bf2d175865 Print which git version we are using for running integration tests Stefan Haller 2025-03-31 21:17:05 +02:00
  • 82e1caa166 Remove conditional code related to git earlier than 2.22 Stefan Haller 2025-03-31 15:57:58 +02:00
  • 765168b9d7 Remove canUsePushTrack parameter of obtainBranches function Stefan Haller 2025-03-31 15:55:01 +02:00
  • ad813503fb Bump minimum required git version to 2.22 Stefan Haller 2025-03-31 15:52:45 +02:00
  • 9469037cdd
    Resolve non-inline merge conflicts (#4431) Stefan Haller 2025-04-09 10:29:47 +02:00
  • ebb576feac Provide conflict resolution dialogs for non-textual conflicts Stefan Haller 2025-03-27 15:31:45 +01:00
  • efcd71b296 Allow chaining of FileSystem methods Stefan Haller 2025-03-27 17:01:35 +01:00
  • 2e1be45957 Better main view display for conflicing files Stefan Haller 2025-03-26 18:26:18 +01:00
  • 6f4a4c9df2
    Merge c233f079ef into a09ca592fa Karim Khaleel 2025-04-09 11:55:11 +09:00
  • a09ca592fa
    Fix display of renamed files in tree view (#4452) Stefan Haller 2025-04-08 16:19:19 +02:00
  • b09251e27b
    Merge branch 'master' into fix-display-of-renamed-files-in-tree-view Stefan Haller 2025-04-08 16:17:33 +02:00
  • 6fb7942500
    Fix wrong main view content after pressing e in a stack of branches (#4450) Stefan Haller 2025-04-08 16:17:14 +02:00
  • 59af407eb1 Fix the bug described in the previous commit Stefan Haller 2025-04-01 16:51:05 +02:00
  • f20b7ea593 Add test demonstrating problem with main view display when pressing e in a stack of branches Stefan Haller 2025-04-01 16:51:23 +02:00
  • 14187c9d15
    More navigation keybindings for confirmation panel (#4404) Stefan Haller 2025-04-08 16:14:17 +02:00
  • 8a4506066a Add pageUp/pageDown/top/bottom keybindings to focused command log panel Stefan Haller 2025-03-19 09:09:12 +01:00
  • 2b783d1bc6 Add pageUp/pageDown/top/bottom keybindings to confirmation panel Stefan Haller 2025-03-19 08:45:13 +01:00
  • ed0cc8b70b
    Some code cleanup (#4449) Stefan Haller 2025-04-08 16:11:00 +02:00
  • cbfa8c288b
    Bump golang.org/x/net from 0.33.0 to 0.36.0 dependabot[bot] 2025-04-08 14:09:14 +00:00
  • 8ba57b6bd0 Cleanup: remove unused interfaces for helpers Stefan Haller 2024-10-11 16:53:27 +02:00
  • b3215a750c Cleanup: get rid of the variadic parameter of ContextMgr.Push Stefan Haller 2024-10-10 14:35:28 +02:00
  • 9c98fd809c
    Fix hyperlinks in last line of confirmation popups (#4454) Stefan Haller 2025-04-08 16:08:01 +02:00
  • 6f31f94266 Enable AutoRenderHyperLinks for the tooltip view Stefan Haller 2025-04-03 08:41:12 +02:00
  • 7322cf1a9e Bump gocui Stefan Haller 2025-04-08 16:04:02 +02:00
  • 1f156c0da2
    Update discord icon to have transparency (#4466) assets Jesse Duffield 2025-04-08 23:08:27 +10:00
  • 7ba76f47b4
    Update kidpix link in README to active url (#4425) Stefan Haller 2025-04-08 13:53:58 +02:00
  • 8d47928c94 Update kidpix link in README to active url Chris McDonnell 2025-03-24 20:09:12 -04:00
  • ee559035ad Update discord icon to have transparency Chris McDonnell 2025-04-07 17:07:13 -04:00
  • f7787fc819
    Better support for shell aliases (#4385) Stefan Haller 2025-04-07 14:38:47 +02:00
  • d13306ac64 Add a breaking changes entry for using shell aliases Stefan Haller 2025-04-03 14:12:34 +02:00
  • dc48cf963a Add config os.shellFunctionsFile Stefan Haller 2025-03-09 18:15:48 +01:00
  • 41e9335ea8 Reorder configs in OSConfig Stefan Haller 2025-03-09 18:09:24 +01:00
  • 4e5e21f946 Revert commits related to using an interactive shell for running shell commands Stefan Haller 2025-03-09 18:03:44 +01:00
  • ee80579231
    Merge 11244abca6 into 959f932ddd Chris McDonnell 2025-04-07 15:48:52 +07:00
  • 959f932ddd
    Fix discarding submodule changes in nested folders (#4317) Stefan Haller 2025-04-07 09:49:38 +02:00
  • f75c0af6e0 Update disabled message Brandon 2025-04-04 23:08:25 -07:00
  • 2db0a024bc Add integration test Brandon 2025-02-23 16:33:12 -08:00
  • 1fa9ea7f04 Fix discarding submodule changes in nested folders Brandon 2025-02-22 14:09:01 -08:00
  • 106b7018dd Cleanup: rename predicate params (test -> predicate) Brandon 2025-04-04 23:06:06 -07:00
  • c488e22abc Bump generics dependency Brandon 2025-04-06 22:08:51 -07:00
  • 8df3132f83
    feat(errors): refactor error constants and enhance mapping Kapparina 2025-04-06 09:38:37 +10:00
  • bab20d581d
    Merge 5d9a954e51 into facc73a88b Neko Box Coder 2025-04-06 09:11:52 +10:00
  • 3bb1cfd446
    Merge branch 'master' into master Shaik Azhar Madar 2025-04-05 22:14:40 +05:30
  • e6837c6d43 support escaping [] in filenames Azhar Madar Shaik 2025-04-05 22:09:31 +05:30
  • d60d1068e2
    docs(custom-command): note on .PromptResponses Minh Tran 2025-04-05 14:53:26 +07:00