|
main
default
|
98d88482
|
cli: for deprecated configs, say at which source level they were found
|
|
|
splittmp
|
f384ea47
|
splittmp
|
|
|
ig/completetool
|
c1f8083d
|
cli completion: complete `--tool` args for merge tools
|
|
|
fetchonewarn
|
a39015a6
|
cli fetch: put all not-found branches into one warning
|
|
|
evodiff
|
4f2af104
|
cli `evolog`: new `--diff-snapshots` option for use with `-p`
|
|
|
completetool
|
fff787dc
|
add new builtin formats
|
|
|
squash-no-restore
|
32d569b8
|
no-restore-descendants
|
|
|
solvai-test
|
330b9bfb
|
cli `squash`: new `--restore-descendants` option
|
|
|
ilyaplus
|
d81f3830
|
newsplit
|
|
|
ilya
|
8f964c1e
|
Merge
|
|
|
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)
|
|
|
streampager-options-old
|
a8add759
|
convert millis to seconds
|
|
|
serde-float
|
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
|
|
ilyagr.bsky.social