Compare commits

..

2 commits

3 changed files with 7 additions and 19 deletions

22
flake.lock generated
View file

@ -177,7 +177,9 @@
"jujutsu": { "jujutsu": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3", "nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
@ -295,22 +297,6 @@
} }
}, },
"nixpkgs_3": { "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": { "locked": {
"lastModified": 1740603184, "lastModified": 1740603184,
"narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=", "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=",
@ -335,7 +321,7 @@
"jujutsu": "jujutsu", "jujutsu": "jujutsu",
"lix-module": "lix-module", "lix-module": "lix-module",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_3",
"nixpkgs-unstable-small": "nixpkgs-unstable-small" "nixpkgs-unstable-small": "nixpkgs-unstable-small"
} }
}, },

View file

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

View file

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