|
main
default
|
98d88482
|
cli: for deprecated configs, say at which source level they were found
|
|
|
splittmp
|
f384ea47
|
splittmp
|
|
|
ilyaplus
|
d81f3830
|
newsplit
|
|
|
ilya
|
8f964c1e
|
Merge
|
|
|
ig/completetool
|
c1f8083d
|
cli completion: complete `--tool` args for merge tools
|
|
|
evodiff
|
4f2af104
|
cli `evolog`: new `--diff-snapshots` option for use with `-p`
|
|
|
completetool
|
fff787dc
|
add new builtin formats
|
|
|
fetchonewarn
|
a39015a6
|
cli fetch: put all not-found branches into one warning
|
|
|
solvai-test
|
330b9bfb
|
cli `squash`: new `--restore-descendants` option
|
|
|
squash-no-restore
|
32d569b8
|
no-restore-descendants
|
|
|
pr/6621
|
8a2dd8a2
|
cargo: Add metadata to build .deb package with cargo-deb
|
|
|
pr/4021
|
4fd28a67
|
run: Flesh out a bare implementation of `jj run`
|
|
|
pr/6466
|
e58b7ad6
|
split: the second commit keeps the change id
|
|
|
ig/conflictsimp
|
7fa82483
|
docs conflicts.md: explain conflict simplification delay
|
|
|
pr/6300
|
85464373
|
docs: document new config location on macOS
|
|
|
logging-undo-yuya
|
6987c7bd
|
undo yuya's suggestion
|
|
|
ig/squash-preserve-snapshot
|
389858b2
|
cli `squash`: new `--restore-descendants` option
|
|
|
gvimdiff
|
4b023c95
|
cli: add `gvimdiff` merge tool, fix docs for diff-invocation-mode
|
|
|
ig/vimdiffwarn
|
5ca7dca3
|
cli: warn on startup for vimdiff used as a diff editor
|
|
|
gitpushspaces
|
48de1e42
|
git push --named: allow spaces around the `=`
|
|
|
ig/spaceconfig
|
fa88527f
|
cli `--config` global option: allow spaces around `=`
|
|
|
pdc-old
|
ad797baa
|
cli: rename `--restore-descendants` to `--preserve-descendant-contents` AKA `--pdc`
|
|
|
ig/pdc
|
684d62e8
|
cli: rename `--restore-descendants` to `--preserve-descendant-content` AKA `--pdc`
|
|
|
ig/move-cargo-config
|
60e8a3dc
|
config: move .cargo/config-ci.toml to .config/cargo-ci-config.toml
|
|
|
pr/6081
|
f7aa20f3
|
dev: add mise config
|
|
|
globpattern
|
3a3902ce
|
even more
|
|
|
interdiff-many
|
9951f032
|
interdiff: multiple revisions in to/from
|
|
|
ig/jjfish
|
cb009784
|
installation docs: workarounds for problems with `jj` fish completion
|
|
|
config-docs2
|
a7a202b6
|
config docs: change --config-file example
|
|
|
ig/revset-insensitive
|
345f7373
|
string patterns: make `substr:` an alias for `substring:`
|
|
|
ig/simplify-merge-view
|
183c73b5
|
simplify
|
|
|
faqevolog-revision
|
8538c71d
|
version with revisions
|
|
|
ci-clippy-everywhere
|
ffebc4e4
|
ci: run clippy on all platforms (DO NOT MERGE probably)
|
|
|
ig/msrv-contr
|
69298416
|
contributing.md: describe MSRV update guidelines
|
|
|
usererror
|
bdca70ad
|
cli: add `jj clone` alias that errors with a friendly message but can be overridden
|
|
|
spacebm
|
6f4e6b67
|
git push: test trying to push bookmark with invalid symbols
|
|
|
push-name-old
|
33ed37ea
|
cli `git push`: new `--name` argument to specify bookmark created by `--change`
|
|
|
streamopts-direct
|
38bd5a14
|
built-in pager: allow configuring streampager options
|
|
|
docs-prerelease
|
9ef0b62a
|
docs: label prerelease docs with different favicon
|
|
|
ig-pr4021
|
4dec1459
|
minor fixups (clippy, UI)
|
|
|
serde-float
|
a8add759
|
convert millis to seconds
|
|
|
streampager-options-old
|
a8add759
|
convert millis to seconds
|
|
|
old-ig-pr4021
|
21b57230
|
minor fixups (clippy, UI)
|
|
|
ig/readme-logo
|
31292097
|
docs and readme: add the new `jj` logo
|
|
|
force-snapshots
|
fcc98af5
|
force-snapshots works
|
|
|
favicon-experiment
|
fe70e55b
|
small squircle
|
|
|
docs-single-page
|
9c1801b2
|
add urls
|
|
|
ig/docsrepo
|
00e22b1a
|
od
|
|
|
diffofmerge
|
d8ae3a35
|
Omit trivial diffs
|
|
|
redact-unconflicted
|
21418744
|
BiasedConflictMarkers implementation
|
|
|
ilya2
|
3d4238f5
|
ilya2
|
|
|
splitfrom
|
a252ca2f
|
cli `split`: add experimental --restore-from AKA --from argument
|
|
|
diffofmerge-dbg
|
c78adfae
|
dbg!
|
|
|
fileedittodo
|
898d88e5
|
resolve: update TODO for `jj file edit`
|
|
|
splittodo
|
8dea650b
|
TODO
|
|
|
fileedit
|
fe95c293
|
cli: new `file edit` command
|
|
|
expldiff
|
d987a3e9
|
lib `merge`: the key `explain_diff_of_merges` function and data structure
|
|
|
gmB
|
671a4802
|
sideB
|
|
|
gmA
|
763f4ce4
|
sideA
|
|
|
pr/4822
|
fce057d8
|
docs: tighten the "previewing docs" section
|
|
|
gh-pages
|
e16606c2
|
Deployed 7de5cb455 to prerelease with MkDocs 1.6.1 and mike 2.1.3
|
|
|
ig/newbefore
|
602254c4
|
cli `new`: Allow `--before/--after` without a value to default to `@`
|
|
|
ig/top-contributing
|
efeeeb16
|
docs: add top-level CONTRIBUTING.md
|
|
|
uv
|
7f07cd4d
|
uv reinit
|
|
|
pr/4829
|
6de1abd8
|
infra: publish PR previews for docs
|
|
|
ig/aliases
|
d773228d
|
cli: make most command aliases not interfere with completion
|
|
|
ci
|
71144442
|
run ci
|
|
|
ig/cifail
|
ba37abe0
|
try # 2
|
|
|
pr/4786
|
fdfe8087
|
local_working_copy: lstat() path to test file existence if creation failed
|
|
|
ig/no-diffedit
|
2073623f
|
disabling diff-editors TODO: Test diff, diff editor
|
|
|
ig/email_domain
|
448f1fd6
|
templates: add .email_domain() method to signatures
|
|
|
op_colors_v1
|
7a557fb0
|
formatter & colors.toml: replace `op_log` color label
|
|
|
tmp-weird-immutable
|
508a88f3
|
tmp: dgb! skipped files TODO: Can this be in --debug?
|
|
|
demos-result
|
b79faa3d
|
result
|
|
|
demos-custom-jj
|
49472e88
|
helpers: setting up JJ_COMMAND; TODO print the JJ being used
|
|
|
pr/4176
|
2df38da1
|
new local line cache implementation
|
|
|
unmat-ig
|
e035fef1
|
conflicts: encode unmaterializeable lines
|
|
|
ig/contr-large-patches
|
791c605f
|
contributing: provide options for discussing larger changes and new features
|
|
|
diffofmerge-backup
|
785d8b25
|
Omit trivial diffs
|
|
|
rye
|
5821b5a9
|
rye
|
|
|
falsetool
|
fd8520bc
|
merge and diff tools: allow expressing the lack of support for using a tool in some way, `cargo run -- diff --tool vscode -r mqsr`
|
|
|
duplicate
|
d671676d
|
duplicate -d (BUGGY if duplicating a parent+child)
|
|
|
prebkmk2
|
b122e456
|
tmp: makes the parent show up in `jj log`
|
|
|
forget-local
|
e4aa22ff
|
cli `branch forget`: add `--local` to forget the local branch and untrack remotes
|
|
|
prebkmk
|
83140462
|
github: bump the github-dependencies group with 2 updates
|
|
|
logempty
|
751b73d6
|
log node template: mark empty un-conflicted commits with `◌`
|
|
|
hideinit
|
84a30b40
|
add `jj init --colocate` that prints an error message
|
|
|
brdoc2
|
1df668e3
|
globs
|
|
|
xprotect
|
9a5fdc2c
|
XProtectService
|
|
|
ilya3
|
ec3d5857
|
Merge of features I use
|
|
|
unmat
|
1991006e
|
conflicts: encode unmaterializeable lines
|
|
|
addsremoves
|
99761f1a
|
accessors
|
|
|
wintest-ci
|
c69f104e
|
(For CI -- test that the parent PR works)
|
|
|
wintest2
|
bed1ca10
|
cli `git remote add/set-url`: use `sanitize_git_url_if_path`
|
|
|
wincrazy
|
107e7810
|
winfun
|
|
|
wintest
|
91f3d5ef
|
test_git_push: make tests work on newer libgit2-s
|
|
|
remotetut
|
030fa4bc
|
try to clarify stuff
|
|
|
conflictdoc
|
ff1e4478
|
docs tutorial + conflicts: try to clarify conflict markers
|
|
|
noquickinstall
|
76fc99af
|
Cargo.toml & `cargo binstall`: disable installation from Quickinstall by default
|
|
|
pr/4080
|
9a6e5d40
|
cargo: bump `git2` to 0.19.0
|
|
|
forget-local-old
|
9fc046ba
|
do not untrack git remote
|
|
|
oldbug3223
|
8e04c8ae
|
Fixup to A-B+AC test (?)
|
|
|
revsets
|
939390d6
|
tables
|
|
|
verdate
|
4a7d58cb
|
cli version: Put `+` before build data instead of `-`
|
|
|
pr/3638
|
c38fe354
|
cli: add libgit2 info to `version --details`
|
|
|
dprint
|
88f64ca7
|
demo of asking `dprint` to run `Prettier`
|
|
|
docfooter
|
c34941f7
|
docs: show `jj` version and commit in the footer of the docs (UNFINISHED)
|
|
|
fvs-root
|
3c51cdec
|
Deployed 60ee462 to prerelease with MkDocs 1.5.3 and mike 2.0.0
|
|
|
pijul
|
68e041e5
|
CI: Add `git add -N` before `git diff`
|
|
|
elided
|
042f3303
|
Count elided draft
|
|
|
gitadd
|
68e041e5
|
CI: Add `git add -N` before `git diff`
|
|
|
diffediterror
|
6dc0f4f5
|
diff errors
|
|
|
diffedit3-slow-example
|
5fad9585
|
diffedit3 slow testcase
|
|
|
local-de3
|
bdec366b
|
Use local ../diffedit3-working
|
|
|
diffedit3
|
4121a41c
|
diff editor: bundle a new `:builtin-web` GUI diff editor
|
|
|
mtcf
|
95accf3e
|
Notes on configurable conflict markers (Comments only)
|
|
|
docnodes
|
e90a36ce
|
templates: document how to turn on the new node styles
|
|
|
merge-tool-extends
|
261b1f55
|
merge-tool-extends or inherits? overriden-by?
|
|
|
pr/3381
|
0710bf25
|
config: use shiny, colored graph nodes by default
|
|
|
nested-conflicts
|
a55b5a43
|
test_conflicts: Demo bug with conflicts in files with conflict markers
|
|
|
indoc-maybe
|
a55b5a43
|
test_conflicts: Demo bug with conflicts in files with conflict markers
|
|
|
duplicateedit
|
fd1fe1c4
|
cli duplicate: add --edit and --checkout arguments
|
|
|
release-action
|
39917982
|
github release: replace unsupported `upload-release-asset` actions
|
|
|
diffedit-in-memory
|
d8c03357
|
diffedit3 draft (in-memory)
|
|
|
de3-onefile
|
b6cae904
|
diff editor: bundle a new `:builtin-web` GUI diff editor
|
|
|
markuntracked
|
c5cafbff
|
changecolor
|
|
|
readable
|
70c134b9
|
(DO NOT MERGE) Replace `.upper()` to use readable case instead of upper case
|
|
|
fetchtags
|
d46ade2a
|
fetch --tags
|
|
|
tagforget
|
a95ebdd8
|
cli `tag`: create a `tag forget` command
|
|
|
tst
|
c271862d
|
Commit B
|
|
|
offline-docs-privacy
|
68c77bae
|
privacy
|
|
|
push-simplify2
|
56d64888
|
simplify function (doesn't work b/c --change creates branches)
|
|
|
tmp
|
28edd00a
|
yuyas version
|
|
|
push-simplify
|
3528bae8
|
cli `git push`: clarify the code path where specific branches are pushed
|
|
|
ig-inttest
|
83a70366
|
compile integration tests as a single binary
|
|
|
pr/2914
|
83a70366
|
compile integration tests as a single binary
|
|
|
breakglass
|
fcffb5f9
|
un-deprecate checkout
|
|
|
new-create-branch
|
3f8c96dd
|
jj new --create-branch -m qq
|
|
|
brforget
|
de232b55
|
branch forget changes
|
|
|
ig/contributing
|
01e0739d
|
Update contributing.md
|
|
|
contributing
|
01e0739d
|
Update contributing.md
|
|
|
opdiff
|
6af51e5d
|
opdiff
|
|
|
clapmarkdown
|
51d05574
|
CI
|
|
|
pdm
|
3a49a5d0
|
pdm
|
|
|
descreb
|
7294186c
|
(Check the part of `move` we changed was tested)
|
|
|
update_flake_lock_action
|
ab264204
|
flake.lock: Update
|
|
|
release-aarch64
|
8e9126a2
|
Install musl:arm64
|
|
|
testonly
|
39b6e148
|
attempt at test-only function (doesn't work)
|
|
|
indexset
|
b2146ab7
|
indexset places
|
|
|
rebasetest-fail
|
d98fe321
|
debugging
|
|
|
refactor2
|
49b9b49b
|
rewrite.rs: optimization for `new_parents`
|
|
|
bug2600test
|
501e5600
|
test_describe_command: add simple demo of bug 2600
|
|
|
rebasersimpler
|
6e83f3d9
|
rebase -r: simplify graph less
|
|
|
refactor
|
f3aeb234
|
refactor rebase -r to use `new_parents` from rewrite.rs
|
|
|
rebasernotes
|
62841386
|
rebasernotes
|
|
|
refactor-old
|
d5850384
|
TODO: Make new_parents include rebased commits
|
|
|
ig/tmp-retrytest-with-testfail
|
8385b9e2
|
(DO NOT MERGE) Check that test failures are not retried
|
|
|
ig/retrytest
|
0d94d471
|
github CI: Retry tests after a 15-min timeout
|
|
|
conflictresolution
|
d542e345
|
Conflict resolution
|
|
|
r-after-todos
|
44daacc4
|
TODOs
|
|
|
simplifynew
|
385e37fa
|
PLACEHOLDER
|
|
|
r-after
|
08026954
|
Stub
|
|
|
rebase-bug
|
d9147c3c
|
rebase -r bug demo
|
|
|
rebase-bug-old
|
0e82dc72
|
rebase -r bug demo
|
|
|
degtest
|
443c3f2b
|
deg
|
|
|
branchless
|
c41b5cfb
|
related-work.md: expand git-branchless description with credits
|
|
|
contribguide
|
d9947c7b
|
docs index.md: mention the contributor's guide
|
|
|
cargover
|
ff47e905
|
cargo: Change prerelease versions to end in ".1-pre" instead of ".0"
|
|
|
docissue
|
23aee22b
|
contributing.md: use the documentation issue template
|
|
|
older
|
38f47701
|
docs: "older version" docs
|
|
|
addremtrait
|
5ef0be73
|
merged_tree: allow building trees with variable-arity overrides
|
|
|
gh-pages-offline
|
56aec196
|
Deployed 772e2b8 to prerelease with MkDocs 1.5.2 and mike 1.1.2
|
|
|
mdformat-poetry
|
f42910a6
|
mdformat formatting
|
|
|
split-contr
|
7630fb9a
|
docs: split contributing.md into guidelines and howtos
|
|
|
ilya-docs
|
b713a421
|
Adapt config to run on ilya-docs branch of ilyagr/jj...
|
|
|
docs-layout
|
7229bf20
|
docs: reconfigure layout
|
|
|
mkdocs-mike
|
31ae843b
|
Github actions to build docs
|
|
|
redirect-example
|
47a212b5
|
redirect example
|
|
|
mdbook
|
c1ae2a48
|
mdbooks merge
|
|
|
mkdocs-mat-old
|
44a832f9
|
mike mkdocs merge
|
|
|
pre-mdbook-fixups
|
d397999d
|
docs: Move installation instructions from README to docs/
|
|
|
gh-pages-martinvonz
|
2dfc0ca5
|
Search-and-replace `https://ilyagr.` with `https://martinvonz.`
|
|
|
gh-pages-init
|
11fec680
|
Initial gh-pages commit
|
|
|
mkdocs-old
|
bf469799
|
important ilya-specific things
|
|
|
mkdocs-read
|
5618f4b2
|
mike mkdocs merge
|
|
|
testundo
|
3e72026b
|
cli tests: Replace `undo` with `op restore` (pt 1)
|
|
|
testundo-draft
|
32e9c50c
|
pending changes
|
|
|
3pane-w
|
d115f6e8
|
fake_diff_editor: Command to print file contents
|
|
|
nodot
|
5aa771ed
|
Fixes to github.md following no. 1989
|
|
|
todos
|
7b3636a5
|
TODOs:
|
|
|
devcont
|
7c863449
|
Try always installing insta and nextest
|
|
|
mdbook-back
|
764e80b8
|
notes
|
|
|
sphinx
|
adf0dce3
|
sphinx
|
|
|
status-hidden
|
f95b9f50
|
Parentheses for hidden (probably not great)
|
|
|
ig/faq-move
|
937ae0e2
|
Add FAQ about move-edit conflicts
|
|
|
prettier
|
f81b586f
|
prettier
|
|
|
mdformat
|
8be66493
|
mdformat
|
|
|
ilya-main
|
26192006
|
refs: rename RefTarget::as_conflict() to as_merge()
|
|
|
tmp-tutorial
|
e818a59a
|
docs `tutorial.md`: incorporate changes to `jj status`
|
|
|
look-at
|
83fdc757
|
partial merge 2
|
|
|
import-reset
|
47424494
|
Add @dbg-s to find out a branch target can't conflict with its #@!$ descendant
|
|
|
status-swap-old
|
4f868ea5
|
Insert (empty) into the short commit template
|
|
|
pre-crate-rename
|
3e294ca2
|
revset: do not suggest deleted local branches, suggest @remote branches
|
|
|
test_old
|
52e437b0
|
run test old
|
|
|
test_before
|
e627d84f
|
run test before
|
|
|
svg
|
2c334dee
|
More svg
|
|
|
coloc-export
|
bd3f4f31
|
Colocated export problem (or just setting branches at root problem?)
|
|
|
coloc-tests
|
2535721e
|
test_git_colocated.rs: Demo bug with undoing branch creation after a push
|
|
|
gitrefs-martin
|
637b8603
|
cli: when restoring to a previous operation, don't roll back git_refs
|
|
|
vscode-debug
|
1393ecee
|
launch.json + tasks.json
|
|
|
forget-fetch
|
db8df677
|
git.rs: Fix bug where a forgotten branch couldn't be fetched
|
|
|
test_todo
|
64749928
|
Try to fix arxanas problem with push. Changed something else?? Shouldn't require push
|
|
|
remote-hint
|
78ca8f08
|
revset: hint for branches with potential remotes
|
|
|
confl-diff
|
04ca3882
|
Include conflicted files in diffedit TODO: test TODO: conflict markers
|
|
|
vscode-merge
|
7802d63d
|
partial merge
|
|
|
export
|
6d23be7e
|
test_git_colocated.rs: Demo bug with undoing branch creation after a push
|
|
|
export-del
|
333e4f02
|
Untested and probably broken deletion
|
|
|
export-old
|
30688f02
|
test_git_colocated.rs: Demo bug with undoing branch creation after a push
|
|
|
for-pijul
|
f87ed9ee
|
formatter: error out on invalid color names
|
|
|
branch-extra
|
01256e64
|
Warn when jj branch set creates a branch
|
|
|
stalefail
|
452e43c5
|
docs: document recovery if `jj workspace update-stale` fails
|
|
|
indexset-poly
|
715d5fb4
|
impl IntoIterator<Item = &'a Commit> + Copy
|
|
|
old-main
|
feeb83dc
|
cargo: bump libc from 0.2.140 to 0.2.141
|
|
|
trie
|
29755457
|
Optimized trie
|
|
|
radix-trie
|
1e54599d
|
Trying to make radix tree more readable
|
|
|
prefix-old
|
4deb21dc
|
Use the trie
|
|
|
loose-ends
|
86b93db0
|
Loose ends
|
|
|
trie-tails
|
ba701678
|
cli: fix highlighting of checkout commit in "log --no-graph"
|
|
|
ig-branch-remote
|
17dad46c
|
`jj branch delete`: Add `--remote` argument
|
|
ilyagr.bsky.social