Commit graph

  • b42466cea4
    Merge 4e6ba53cef into fc59d7957f Philipp Albrecht 2024-12-23 21:19:14 +0100
  • a7bd19790d
    Merge 63fb8f0796 into fc59d7957f Scott Taylor 2024-12-23 11:31:00 -0800
  • fc59d7957f github: bump github/codeql-action in the github-dependencies group main dependabot[bot] 2024-12-23 15:25:16 +0000
  • d56d0857fc cargo: bump the cargo-dependencies group with 4 updates dependabot[bot] 2024-12-23 15:30:36 +0000
  • 1329470a38
    Merge a05c655a02 into 542d09c6a9 Essien Ita Essien 2024-12-23 13:02:32 -0500
  • 8491465492
    Merge 30c657de91 into 542d09c6a9 Martin von Zweigbergk 2024-12-23 13:02:32 -0500
  • 543db47ece
    Merge 7a79b67973 into 542d09c6a9 Marijan Smetko 2024-12-23 13:02:32 -0500
  • 61d0eeac55
    Merge 5c5f03ac56 into 542d09c6a9 Emily 2024-12-23 13:02:32 -0500
  • 6590185747
    Merge 26d9d5a507 into 542d09c6a9 Emily 2024-12-23 13:02:32 -0500
  • c94930a33b
    Merge f891e16053 into 542d09c6a9 Christian Stoitner 2024-12-23 13:02:32 -0500
  • c3674c0aef
    Merge 2be3011f7d into 542d09c6a9 gtsiam 2024-12-23 13:02:32 -0500
  • b76062fd36
    Merge d4d3183a64 into 542d09c6a9 Benjamin Tan 2024-12-23 13:02:32 -0500
  • a16612908c
    Merge 46731eb56e into 542d09c6a9 Philipp Albrecht 2024-12-23 17:23:02 +0100
  • f193a7223b
    Merge e08a04ee0f into 542d09c6a9 Philip Metzger 2024-12-23 07:43:16 -0800
  • 9efc76a3ce
    cargo: bump the cargo-dependencies group with 4 updates dependabot[bot] 2024-12-23 15:30:36 +0000
  • e8398ff9e2
    github: bump github/codeql-action in the github-dependencies group dependabot[bot] 2024-12-23 15:25:16 +0000
  • 65ad46787a
    Merge 7c4f747547 into 542d09c6a9 Scott Taylor 2024-12-23 08:44:24 -0600
  • 7c4f747547 resolve: try to resolve all conflicted files in fileset Scott Taylor 2024-12-17 09:33:19 -0600
  • 22fd4448fc merge_tools: extract MergeToolFile struct Scott Taylor 2024-12-17 08:47:34 -0600
  • 0b131ff218
    Merge 70e796a6b6 into 542d09c6a9 Benjamin Tan 2024-12-23 09:42:31 -0500
  • f9b117acd2
    Merge d8a09f7ece into 542d09c6a9 Austin Seipp 2024-12-23 15:42:19 +0100
  • 542d09c6a9 merge_tools: add "$marker_length" variable Scott Taylor 2024-12-21 13:19:09 -0600
  • 6374dd0cfe cli: abandon, describe: parse -rREV option properly Yuya Nishihara 2024-12-23 18:58:19 +0900
  • 5bd669e892 settings: propagate configuration error of commit and operation parameters Yuya Nishihara 2024-12-23 17:32:11 +0900
  • 4a69d0178c settings: cache commit and operation parameters by UserSettings Yuya Nishihara 2024-12-23 17:30:21 +0900
  • c114a43d45 settings: propagate configuration error of commit and operation parameters Yuya Nishihara 2024-12-23 17:32:11 +0900
  • 8f2178a56e settings: cache commit and operation parameters by UserSettings Yuya Nishihara 2024-12-23 17:30:21 +0900
  • d2714ec4ce cli: abandon, describe: parse -rREV option properly Yuya Nishihara 2024-12-23 18:58:19 +0900
  • 82679ccc2d
    Merge e723d10446 into d91e355674 Matt 2024-12-23 01:22:14 -0800
  • 61163b6be3
    Merge 1b9c9cfd2c into d91e355674 Jakub Bielecki 2024-12-23 01:22:14 -0800
  • fd2a76f98a
    Merge defa823e0f into d91e355674 Waleed Khan 2024-12-23 01:22:14 -0800
  • 0960523b6e
    Merge cd5922db45 into d91e355674 Waleed Khan 2024-12-23 01:22:10 -0800
  • b69f98dfe9
    Merge 2a22c879bd into d91e355674 Preston Van Loon 2024-12-23 13:57:56 +0900
  • ae1bcf001c
    Merge 2834b37888 into d91e355674 Martin von Zweigbergk 2024-12-23 13:42:54 +0900
  • 1e71b9d879
    Merge 79bc5bcbe3 into d91e355674 Matt 2024-12-23 13:33:27 +0900
  • 6f3287b691
    Merge e624a7f071 into d91e355674 Bryce Berger 2024-12-23 01:58:38 +0000
  • e624a7f071
    describe: add tests for "ignore-rest" Bryce Berger 2024-12-20 08:47:05 -0500
  • d4b5175dd2
    describe: ignore everything below ignore-rest line Bryce Berger 2024-12-20 08:18:09 -0500
  • d91e355674 cli: git clone: convert local Git remote path to slash-separated path Yuya Nishihara 2024-12-21 12:01:28 +0900
  • 73c5ea2821
    Merge e5ab0d0f81 into 6f00c565b2 Yuya Nishihara 2024-12-23 09:34:35 +0900
  • b928e6490f cli: git clone: convert local Git remote path to slash-separated path Yuya Nishihara 2024-12-21 12:01:28 +0900
  • 6f00c565b2 graph: inline ReverseGraphIterator to callers Yuya Nishihara 2024-12-22 10:28:14 +0900
  • ec853027be graph: make reverse_graph() return nodes in "reversed" order Yuya Nishihara 2024-12-22 10:25:31 +0900
  • d6b84da382 graph: extract function that reverses graph edges Yuya Nishihara 2024-12-22 10:23:38 +0900
  • 6bf36a13ff
    Merge 5fbc37615a into 7bf31c1557 Jordan Seiler 2024-12-22 22:38:53 +0200
  • 30c2ade2cd
    Merge 0bbad88ac0 into 7bf31c1557 Austin Seipp 2024-12-22 10:50:19 -0800
  • 389b514c26
    Merge 7f91da2088 into 7bf31c1557 Austin Seipp 2024-12-22 10:45:28 -0800
  • c92c23b2ce
    Merge 799511c20d into 7bf31c1557 Austin Seipp 2024-12-22 10:39:00 -0800
  • 875d5940cc
    Merge bfd6b11a87 into 7bf31c1557 Philip Metzger 2024-12-22 10:29:30 -0800
  • d3c7ad9884 merge_tools: add "$marker_length" variable Scott Taylor 2024-12-21 13:19:09 -0600
  • 7bf31c1557 merge_tools: preserve executable bit on resolve Scott Taylor 2024-12-21 13:36:11 -0600
  • afa2f2deca resolve: demo executable bit being lost Scott Taylor 2024-12-21 14:34:52 -0600
  • e5ab0d0f81 cli: push new non-tracking bookmarks by default, rename --allow-new flag Yuya Nishihara 2024-10-28 17:43:16 +0900
  • 13d5f4a9e0
    Merge 76c3d3dcf1 into 2aaf6cc3c9 Kyle J Strand 2024-12-21 22:52:29 -0800
  • d4d067b3eb
    Merge d987a3e9f3 into 2aaf6cc3c9 Ilya Grigoriev 2024-12-22 13:00:30 +0900
  • 2232309ac9 merge_tools: preserve executable bit on resolve Scott Taylor 2024-12-21 13:36:11 -0600
  • 498fc4a2f2 resolve: demo executable bit being lost Scott Taylor 2024-12-21 14:34:52 -0600
  • 8a61805218 graph: inline ReverseGraphIterator to callers Yuya Nishihara 2024-12-22 10:28:14 +0900
  • 7c98971948 graph: make reverse_graph() return nodes in "reversed" order Yuya Nishihara 2024-12-22 10:25:31 +0900
  • 363e86f82e graph: extract function that reverses graph edges Yuya Nishihara 2024-12-22 10:23:38 +0900
  • 2aaf6cc3c9 cli: remove now redundant dunce::simplified() from run_ui_editor() Yuya Nishihara 2024-12-21 11:30:32 +0900
  • 78b5766993 repo, workspace: use dunce::canonicalize() to normalize paths Yuya Nishihara 2024-12-21 11:26:01 +0900
  • 5fbc37615a evolog: Fix clippy lints JDSeiler 2024-12-21 16:01:32 -0500
  • 153a6ecb8f evolog: Implement --reversed flag JDSeiler 2024-12-21 13:02:31 -0500
  • 6baa43624c local_working_copy: store materialized conflict marker length Scott Taylor 2024-11-27 14:15:49 -0600
  • b11ce6bd28 conflicts: escape conflict markers by making them longer Scott Taylor 2024-11-24 15:20:18 -0600
  • 369e8ea057 conflicts: refactor conflict marker writing and parsing Scott Taylor 2024-11-24 15:20:18 -0600
  • 252ffad720 local_working_copy: store materialized conflict marker length Scott Taylor 2024-11-27 14:15:49 -0600
  • fc11c5baae conflicts: escape conflict markers by making them longer Scott Taylor 2024-11-24 15:20:18 -0600
  • 3ad41cfe58 conflicts: refactor conflict marker writing and parsing Scott Taylor 2024-11-24 15:20:18 -0600
  • ccf7b14304 cli: remove now redundant dunce::simplified() from run_ui_editor() Yuya Nishihara 2024-12-21 11:30:32 +0900
  • a725535474 repo, workspace: use dunce::canonicalize() to normalize paths Yuya Nishihara 2024-12-21 11:26:01 +0900
  • f108803c96
    repo: make commit visible when pointing bookmark to it push-uulxprvmmtsw Martin von Zweigbergk 2024-12-20 13:53:55 -0800
  • 75ce7f6b7f absorb: abandon source commit if it becomes discardable Yuya Nishihara 2024-12-20 12:21:55 +0900
  • bb6b551a4c commit_builder: add is_empty(), is_discardable(), and .abandon() Yuya Nishihara 2024-12-20 12:15:01 +0900
  • f7fd523dd8 rewrite: remove unneeded Result from CommitRewriter::reparent() Yuya Nishihara 2024-12-20 18:09:57 +0900
  • d0f0e8dcff settings: propagate error from git_settings() and signing_backend() Yuya Nishihara 2024-12-17 23:52:21 +0900
  • 52511f491e settings: inline CLI options to callers, propagate type error Yuya Nishihara 2024-12-17 20:46:32 +0900
  • 3381dd2a2c cli: extract helper function that constructs SnapshotOptions Yuya Nishihara 2024-12-19 18:10:07 +0900
  • 1b4e210524 help: move "git push --remote" explanation to main paragraph, some clarification Yuya Nishihara 2024-12-20 19:21:10 +0900
  • e08a04ee0f
    bookmark: Make bookmark {create, set, move} unhide hidden commits pm/push-tpqqxxvkxsok Philip Metzger 2024-12-04 20:15:28 +0100
  • dddeb8b526 lib: fix various typos Benjamin Tan 2024-12-20 15:32:36 +0800
  • a0e18652ef
    lib: fix various typos Benjamin Tan 2024-12-20 15:32:36 +0800
  • c8fe996336
    commit: Add commit.is_hidden(repo) Philip Metzger 2024-12-07 22:15:46 +0100
  • d4d3183a64
    cli: git: allow signing commits on push bnjmnt4n/push-qqwqrnzynrru Benjamin Tan 2024-12-20 06:08:27 +0800
  • 84f9d8999f sign: Add templater methods to show signature info Anton Bulakh 2023-11-27 02:29:03 +0200
  • 7630a81637 sign: move TestSigningBackend to lib pylbrecht 2024-11-01 10:24:18 +0100
  • 7963536068 github: bump astral-sh/setup-uv in the github-dependencies group dependabot[bot] 2024-12-20 15:24:29 +0000
  • c611a0d781
    github: bump astral-sh/setup-uv in the github-dependencies group dependabot[bot] 2024-12-20 15:24:29 +0000
  • 750c701647 settings: propagate error from git_settings() and signing_backend() Yuya Nishihara 2024-12-17 23:52:21 +0900
  • 2be3011f7d cli: unify alias & default-command parsing George Tsiamasiotis 2024-12-20 12:41:58 +0200
  • 040c1f517f cli: move related methods closer George Tsiamasiotis 2024-12-20 12:31:28 +0200
  • 26385f71a0 cli: simplify argument expansion code George Tsiamasiotis 2024-12-20 10:39:16 +0200
  • 88ac1ca689 settings: inline CLI options to callers, propagate type error Yuya Nishihara 2024-12-17 20:46:32 +0900
  • 0ff15500d8 cli: extract helper function that constructs SnapshotOptions Yuya Nishihara 2024-12-19 18:10:07 +0900
  • e0ef241a70 help: move "git push --remote" explanation to main paragraph, some clarification Yuya Nishihara 2024-12-20 19:21:10 +0900
  • 18143f8037 absorb: abandon source commit if it becomes discardable Yuya Nishihara 2024-12-20 12:21:55 +0900
  • c68ac4ba4f commit_builder: add is_empty(), is_discardable(), and .abandon() Yuya Nishihara 2024-12-20 12:15:01 +0900
  • 0c018e1629 rewrite: remove unneeded Result from CommitRewriter::reparent() Yuya Nishihara 2024-12-20 18:09:57 +0900
  • ef49643128 tests: use toml_edit::Value in more places Yuya Nishihara 2023-12-24 16:55:16 +0900