Commits

Branch selector

 main

User selector

All users

Datepicker

All time

Commit History

Commits on Jan 10, 2025

• cli: remove handling of deprecated fix.tool-command config

  Show description for e124404
  yuja

  committed
  e124404

  Copy full SHA for e124404

• config: allow inline table syntax in mutation and conditional scope API

  Show description for b97b738
  yuja

  committed
  b97b738

  Copy full SHA for b97b738

• github: don't run dependabot or gh-readonly-queue builds twice

  Show description for 1b07df1
  thoughtpolice

  committed
  1b07df1

  Copy full SHA for 1b07df1

• git: remove PartialEq requirement from GitPushError

  Show description for f14a6e6
  

  yuja

  authored and

  thoughtpolice

  committed
  f14a6e6

  Copy full SHA for f14a6e6

• tests: insert insta::allow_duplicates! { .. } per snapshot

  Show description for ce6119a
  yuja

  committed
  ce6119a

  Copy full SHA for ce6119a

Commits on Jan 9, 2025

• contributing: recommend bacon over cargo-watch

  Show description for 84e619c
  bryceberger

  committed
  84e619c

  Copy full SHA for 84e619c

• cargo: bump the cargo-dependencies group with 4 updates

  Show description for cba1966
  

  dependabot[bot]

  authored and

  PhilipMetzger

  committed
  cba1966

  Copy full SHA for cba1966

• github: bump the github-dependencies group with 2 updates

  Show description for d913ec5
  

  dependabot[bot]

  authored and

  thoughtpolice

  committed
  d913ec5

  Copy full SHA for d913ec5

• cli: oplog: add builtin_op_log_oneline template

  Show description for 80c4222
  jakobhellermann

  committed
  80c4222

  Copy full SHA for 80c4222

• git: port s/bookmark/branch/ renames to config migration rules

  Show description for 720c903
  yuja

  committed
  720c903

  Copy full SHA for 720c903

• cli: integrate config migration

  Show description for 30fb107
  yuja

  committed
  30fb107

  Copy full SHA for 30fb107

• config: add simple migration logic to update deprecated variables

  Show description for 98eaadf
  yuja

  committed
  98eaadf

  Copy full SHA for 98eaadf

• files: use Merge constructor to interleave conflicting diff parts

  Show description for 3fbf124
  yuja

  committed
  3fbf124

  Copy full SHA for 3fbf124

• merge: inline trivial_merge_inner()

  Show description for 3d4b5e4
  yuja

  committed
  3d4b5e4

  Copy full SHA for 3d4b5e4

• merge: update test values to be simpler and more clearly exhaustive

  martinvonz

  committed
  8a3ae86

  Copy full SHA for 8a3ae86

• merge: make trivial_merge() take a single slice of interleaved terms

  Show description for 7149429
  martinvonz

  committed
  7149429

  Copy full SHA for 7149429

Commits on Jan 8, 2025

• resolve: try to resolve all conflicted files in fileset

  Show description for 7df0f16
  scott2000

  committed
  7df0f16

  Copy full SHA for 7df0f16

• merge_tools: extract MergeToolFile struct

  Show description for 5f77edf
  scott2000

  committed
  5f77edf

  Copy full SHA for 5f77edf

• github: don't run build workflows twice on push to main

  Show description for 6fec006
  thoughtpolice

  committed
  6fec006

  Copy full SHA for 6fec006

• github: don't cancel concurrent builds on main

  Show description for a45eb0b
  thoughtpolice

  committed
  a45eb0b

  Copy full SHA for a45eb0b

• lib: remove hack to migrate old git remotes

  Show description for 6083135
  thoughtpolice

  committed
  6083135

  Copy full SHA for 6083135

• cli: make git support optional

  Show description for e15429b
  thoughtpolice

  committed
  e15429b

  Copy full SHA for e15429b

• lib: remove use of zstd

  Show description for 992066c
  thoughtpolice

  committed
  992066c

  Copy full SHA for 992066c

• cargo: bump rustix in the cargo-dependencies group

  Show description for 02a7589
  

  dependabot[bot]

  authored and

  thoughtpolice

  committed
  02a7589

  Copy full SHA for 02a7589

• diff: add merge-tools.*.diff-expected-exit-codes

  Show description for b1b2c62
  bryceberger

  committed
  b1b2c62

  Copy full SHA for b1b2c62

• Back out "config: merge and print inline tables as values"

  Show description for d001291
  yuja

  committed
  d001291

  Copy full SHA for d001291

• github: install and use nextest for GHA

  Show description for 664ba1a
  thoughtpolice

  committed
  664ba1a

  Copy full SHA for 664ba1a

• github: add merge_group event to several workflows

  Show description for fe9ea50
  thoughtpolice

  committed
  fe9ea50

  Copy full SHA for fe9ea50

• docs: improve and convert library design diagram to SVG

  Show description for a621d8c
  thoughtpolice

  committed
  a621d8c

  Copy full SHA for a621d8c

• cli: warn if command matches with aliases inserted by --config* arguments

  Show description for e6c0692
  yuja

  committed
  e6c0692

  Copy full SHA for e6c0692

• local_working_copy: on snapshot, ignore submodule in ignored directories

  Show description for 49999a7
  yuja

  committed
  49999a7

  Copy full SHA for 49999a7

Commits on Jan 7, 2025

• cargo: bump the cargo-dependencies group across 1 directory with 4 updates

  Show description for 4a86378
  

  dependabot[bot]

  authored and

  github-actions[bot]

  committed
  4a86378

  Copy full SHA for 4a86378

• rewrite: back out 9d4a973

  Show description for 4a7d989
  martinvonz

  committed
  4a7d989

  Copy full SHA for 4a7d989

• rewrite: add another test of rebasing with same change on both sides

  martinvonz

  committed
  ada946d

  Copy full SHA for ada946d

• github: migrate all actions to ubuntu-24.04

  Show description for 252f6d8
  thoughtpolice

  committed
  252f6d8

  Copy full SHA for 252f6d8

Pagination

Previous

Next