3 files changed, 15 insertions, 5 deletions
diff --git a/jj/.config/jj/config.toml b/jj/.config/jj/config.toml
index 638050d..0a3aca7 100644
--- a/jj/.config/jj/config.toml
+++ b/jj/.config/jj/config.toml
@@ -21,12 +21,16 @@ pushall = ["util", "exec", "--", "sh", "-c", '''
   done
 ''', ""]
 
+[revsets]
+bookmark-advance-to = 'closest_pushable(@)'
+
+[revset-aliases]
+# closest revision that is mutable, described and either non-empty or a merge
+'closest_pushable(to)' = '''
+  heads(::to & mutable() & ~description(exact:"") & (~empty() | merges()))
+'''
+
 [ui]
 default-command = "log"
-diff-editor = "ediff"
 diff-instructions = false
 
-[merge-tools.ediff]
-program = "emacs"
-edit-args = ["-l", "/home/hi/.config/jj/ediff-split.el",
-             "-f", "jj-ediff-split", "$left", "$right"]
diff --git a/jj/.config/jj/repos/acf5813888d24d9b20b1/config.toml b/jj/.config/jj/repos/acf5813888d24d9b20b1/config.toml
new file mode 100644
index 0000000..539d610
--- /dev/null
+++ b/jj/.config/jj/repos/acf5813888d24d9b20b1/config.toml
@@ -0,0 +1,4 @@
+#:schema https://docs.jj-vcs.dev/latest/config-schema.json
+
+[git]
+push = ["origin", "www"]
diff --git a/jj/.config/jj/repos/acf5813888d24d9b20b1/metadata.binpb b/jj/.config/jj/repos/acf5813888d24d9b20b1/metadata.binpb
new file mode 100644
index 0000000..eeeb37c
--- /dev/null
+++ b/jj/.config/jj/repos/acf5813888d24d9b20b1/metadata.binpb
@@ -0,0 +1,2 @@
+
+/home/hi/website/.jj/repo
+\ No newline at end of file