diff --git a/config/jj/config.toml b/config/jj/config.toml
index 94e8f1e..d4cecb0 100644
--- a/config/jj/config.toml
+++ b/config/jj/config.toml
@@ -19,3 +19,13 @@ auto-local-bookmark = true
 l = ["log", "-n10"]
 n = ["new"]
 bc = ["bookmark", "create"]
+tug = ["bookmark", "move", "--from", "heads(::@- & bookmarks())", "--to", "@-"]
+
+[templates]
+draft_commit_description = '''
+concat(
+  coalesce(description, default_commit_description, "\n"),
+  "\nJJ: ignore-rest\n",
+  diff.git(),
+)
+'''