Commits

Branch selector

 main

User selector

scott2000

All time

Commit History

Commits on Mar 3, 2025

• docs: fix syntax highlighting for conflicts.md

  Show description for a95281f
  scott2000

  committed
  a95281f

  Copy full SHA for a95281f

Commits on Feb 17, 2025

• cli: untrack remote bookmarks on `bookmark forget`

  Show description for 00f87a2
  scott2000

  committed
  00f87a2

  Copy full SHA for 00f87a2

Commits on Jan 31, 2025

• conflicts: use clearer wording for missing newline comment

  Show description for 66808e5
  scott2000

  committed
  66808e5

  Copy full SHA for 66808e5

• conflicts: don't mark missing newline in Git-style conflicts

  Show description for 0b71933
  scott2000

  committed
  0b71933

  Copy full SHA for 0b71933

Commits on Jan 29, 2025

• docs: explain `[noeol]` conflict marker comment

  Show description for 95df920
  scott2000

  committed
  95df920

  Copy full SHA for 95df920

Commits on Jan 27, 2025

• conflicts: show "noeol" state in conflict marker comment

  Show description for 66faeb4
  scott2000

  committed
  66faeb4

  Copy full SHA for 66faeb4

• conflicts: allow missing newlines at end of file

  Show description for 326c453
  scott2000

  committed
  326c453

  Copy full SHA for 326c453

• conflicts: remove support for non-simplified file conflicts

  Show description for 352807c
  scott2000

  committed
  352807c

  Copy full SHA for 352807c

Commits on Jan 26, 2025

• tests: keep user's `$PATH` while running `jj` commands

  Show description for 0006911
  scott2000

  committed
  0006911

  Copy full SHA for 0006911

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

Commits on Jan 7, 2025

• git: add dummy conflict to index if necessary

  Show description for e6a51d6
  scott2000

  committed
  e6a51d6

  Copy full SHA for e6a51d6

• git: use merged parent tree for git index

  Show description for 42b390b
  scott2000

  committed
  42b390b

  Copy full SHA for 42b390b

• git: use gix instead of git2 to update index

  Show description for 9cc8b35
  scott2000

  committed
  9cc8b35

  Copy full SHA for 9cc8b35

• git: add tests for index in colocated repo

  Show description for 8e3ec9c
  scott2000

  committed
  8e3ec9c

  Copy full SHA for 8e3ec9c

• git: make `update_git_head` accept an expected ref

  Show description for 3f72604
  scott2000

  committed
  3f72604

  Copy full SHA for 3f72604

Commits on Dec 26, 2024

• docs: explain long conflict markers

  scott2000

  committed
  0dbcdf7

  Copy full SHA for 0dbcdf7

Commits on Dec 23, 2024

• merge_tools: add "$marker_length" variable

  Show description for 542d09c
  scott2000

  committed
  542d09c

  Copy full SHA for 542d09c

Commits on Dec 22, 2024

• merge_tools: preserve executable bit on resolve

  scott2000

  committed
  7bf31c1

  Copy full SHA for 7bf31c1

• resolve: demo executable bit being lost

  Show description for afa2f2d
  scott2000

  committed
  afa2f2d

  Copy full SHA for afa2f2d

Commits on Dec 21, 2024

• local_working_copy: store materialized conflict marker length

  Show description for 6baa436
  scott2000

  committed
  6baa436

  Copy full SHA for 6baa436

• conflicts: escape conflict markers by making them longer

  Show description for b11ce6b
  scott2000

  committed
  b11ce6b

  Copy full SHA for b11ce6b

• conflicts: refactor conflict marker writing and parsing

  Show description for 369e8ea
  scott2000

  committed
  369e8ea

  Copy full SHA for 369e8ea

Commits on Dec 17, 2024

• gitignore: remove FIXME comment about passing path

  Show description for d75cc94
  scott2000

  committed
  d75cc94

  Copy full SHA for d75cc94

• gitignore: add more detail to errors on invalid pattern

  scott2000

  committed
  9591523

  Copy full SHA for 9591523

• snapshot: demo unreadable error message on invalid ignore

  Show description for 7f1d902
  scott2000

  committed
  7f1d902

  Copy full SHA for 7f1d902

Commits on Dec 4, 2024

• merge_tools: add merge-conflict-exit-codes option

  Show description for fa7d9c0
  scott2000

  committed
  fa7d9c0

  Copy full SHA for fa7d9c0

Commits on Nov 26, 2024

• merge_tools: allow setting conflict marker style per-tool

  Show description for 7f57866
  scott2000

  committed
  7f57866

  Copy full SHA for 7f57866

Commits on Nov 25, 2024

• tutorial: fix conflict formatting issue

  scott2000

  committed
  ea72a4a

  Copy full SHA for ea72a4a

Commits on Nov 23, 2024

• docs: rewrite conflict marker docs to include new styles

  Show description for 472fd35
  scott2000

  committed
  472fd35

  Copy full SHA for 472fd35

• conflicts: add "git" conflict marker style

  Show description for 26f5d61
  scott2000

  committed
  26f5d61

  Copy full SHA for 26f5d61

• merge: add `as_slice()` method

  Show description for ec6220d
  scott2000

  committed
  ec6220d

  Copy full SHA for ec6220d

• conflicts: extract function for materializing hunk

  Show description for 54c453b
  scott2000

  committed
  54c453b

  Copy full SHA for 54c453b

• conflicts: add "snapshot" conflict marker style

  Show description for d2b06b9
  scott2000

  committed
  d2b06b9

  Copy full SHA for d2b06b9

• conflicts: extract header output into separate functions

  Show description for 863cba3
  scott2000

  committed
  863cba3

  Copy full SHA for 863cba3

Pagination

Previous

Next