WIP: ADD NOTE FOR FUTURE SELF
All checks were successful
ci/woodpecker/push/check Pipeline was successful
All checks were successful
ci/woodpecker/push/check Pipeline was successful
This commit is contained in:
parent
a008c9b73b
commit
ccf222eb9c
1 changed files with 36 additions and 0 deletions
|
|
@ -36,8 +36,16 @@ in
|
||||||
|
|
||||||
aliases = {
|
aliases = {
|
||||||
jj = [ ];
|
jj = [ ];
|
||||||
|
# FIXME:
|
||||||
|
# * still not a big fan of the template
|
||||||
lol = [ "log" "-r" "..@" "-T" "builtin_log_oneline" ];
|
lol = [ "log" "-r" "..@" "-T" "builtin_log_oneline" ];
|
||||||
lola = [ "lol" "-r" "all()" ];
|
lola = [ "lol" "-r" "all()" ];
|
||||||
|
# FIXME: equivalent to `git switch -`
|
||||||
|
# See https://github.com/jj-vcs/jj/issues/2871
|
||||||
|
# Might be broken recently https://discord.com/channels/968932220549103686/1380272574709366989/1380432041983606855
|
||||||
|
# TODO:
|
||||||
|
# * `pick` (https://github.com/jj-vcs/jj/issues/5446): [ "util" "exec" "--" "bash" "-c" "jj log -p -r \"diff_contains($1)\"" "" ]
|
||||||
|
# * `root`: `jj workspace root` (barely necessary then)
|
||||||
};
|
};
|
||||||
|
|
||||||
ui = {
|
ui = {
|
||||||
|
|
@ -47,6 +55,31 @@ in
|
||||||
merge-editor = ":builtin";
|
merge-editor = ":builtin";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# FIXME: git equivalents
|
||||||
|
# I'd like a better formatted blame (more like delta's?)
|
||||||
|
# blame = {
|
||||||
|
# coloring = "repeatedLines";
|
||||||
|
# markIgnoredLines = true;
|
||||||
|
# markUnblamables = true;
|
||||||
|
# };
|
||||||
|
# FIXME: log colors should probably match git
|
||||||
|
# FIXME: patience diff?
|
||||||
|
# FIXME: fetch prune/pruneTags?
|
||||||
|
# FIXME: pull.rebase=true? Probably true TBH
|
||||||
|
# FIXME: push.default=simple? Probably true TBH
|
||||||
|
# FIXME: conflict style? ui.conflict-marker-style=git is diff3, not zdiff3. Default looks fine-ish
|
||||||
|
|
||||||
|
# FIXME: from ma_9's config, plus my own stuff
|
||||||
|
# snapshot = {
|
||||||
|
# auto-track = "none()";
|
||||||
|
# };
|
||||||
|
#
|
||||||
|
# ui = {
|
||||||
|
# movement = {
|
||||||
|
# edit = false;
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
|
||||||
templates = {
|
templates = {
|
||||||
# Equivalent to `commit.verbose = true` in Git
|
# Equivalent to `commit.verbose = true` in Git
|
||||||
draft_commit_description = "commit_description_verbose(self)";
|
draft_commit_description = "commit_description_verbose(self)";
|
||||||
|
|
@ -60,6 +93,9 @@ in
|
||||||
diff.git(),
|
diff.git(),
|
||||||
)
|
)
|
||||||
'';
|
'';
|
||||||
|
# FIXME: use `diff.summary()` instead? Supported by syntax highlighting
|
||||||
|
# See https://github.com/jj-vcs/jj/issues/1946#issuecomment-2572986485
|
||||||
|
# FIXME: tree-sitter grammar isn't in `nvim-treesitter` (https://github.com/kareigu/tree-sitter-jjdescription)
|
||||||
"commit_description(commit)" = ''
|
"commit_description(commit)" = ''
|
||||||
concat(
|
concat(
|
||||||
commit.description(), "\n",
|
commit.description(), "\n",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue