Compare commits

..

No commits in common. "ba4d2ef80ccdfe4aac82c3e87d0ef8ace7de42a3" and "75e6492a415c7ce8ea17286ca5118cb980fb6e99" have entirely different histories.

3 changed files with 19 additions and 7 deletions

22
flake.lock generated
View file

@ -177,9 +177,7 @@
"jujutsu": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs": "nixpkgs_3",
"rust-overlay": "rust-overlay"
},
"locked": {
@ -297,6 +295,22 @@
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1731890469,
"narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5083ec887760adfe12af64830a66807423a859a7",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1740603184,
"narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=",
@ -321,7 +335,7 @@
"jujutsu": "jujutsu",
"lix-module": "lix-module",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_4",
"nixpkgs-unstable-small": "nixpkgs-unstable-small"
}
},

View file

@ -60,7 +60,6 @@
owner = "jj-vcs";
repo = "jj";
ref = "v0.26.0";
inputs.nixpkgs.follows = "nixpkgs";
};
};

View file

@ -7,7 +7,7 @@ diff-editor = ":builtin"
paginate = "auto"
editor = "vim"
pager = "less -FRX"
default-command = "logstatus"
default-command = "log"
[ui.movement]
edit = false
@ -23,7 +23,6 @@ pdiff = ["diff", "-r", "@-"]
tug = ["bookmark", "move", "--from", "closest_bookmark(@-)", "--to", "@-"]
ll = ["log", "-T", "builtin_log_detailed"]
l = ["log", "-T", "builtin_log_compact"]
logstatus = ["util", "exec", "--", "sh", "-c", "jj status && jj log"]
[revset-aliases]
'closest_bookmark(to)' = 'heads(::to & bookmarks())'