diff --git a/.dotter/global.toml b/.dotter/global.toml index 0c4ad8a..c6294a9 100644 --- a/.dotter/global.toml +++ b/.dotter/global.toml @@ -15,6 +15,10 @@ sh = "~" [vcs.files] "vcs/README.md" = { target = "~/NOWHERE", type = "symbolic", if = "false" } +"vcs/git" = "~/.config" +"vcs/jj" = "~/.config/jj" +"vcs/gitignore/config" = "~/.config" +"vcs/gitignore/local" = "~/.local" vcs = "~" [nvim.files] diff --git a/vcs/README.md b/vcs/README.md index 1c38319..6315168 100644 --- a/vcs/README.md +++ b/vcs/README.md @@ -1,15 +1,17 @@ -# Git module +# Version control software module [git](https://git-scm.com/) - a distributed version control system +[jujutsu](https://martinvonz.github.io/jj/latest/) - a change-based version control system ## What's in this module [[_TOC_]] -## Global git settings +## Global vcs settings -This is probably the first thing that needs to be customized, since it points to a different identity for each git user. +This are probably the first things that need to be customized, since it points to a different identity for each git user. I sign all my commits by default, so take out the corresponding lines if you don't, or exchange it with your gpg key. +Similarly for jujutsu, change the identity and remove the lines concerning gpg signing if you don't use it. Git will rewrite any remotes using http(s) to use the ssh notation for pushes to github and gitlab so that, even if you set up the repository using an https url you can utilize your usual ssh key for pushing. diff --git a/vcs/.config/git/config b/vcs/git/git/config similarity index 100% rename from vcs/.config/git/config rename to vcs/git/git/config diff --git a/vcs/.config/git/ignore b/vcs/git/git/ignore similarity index 100% rename from vcs/.config/git/ignore rename to vcs/git/git/ignore diff --git a/vcs/.config/sh/alias.d/git.sh b/vcs/git/sh/alias.d/git.sh similarity index 100% rename from vcs/.config/sh/alias.d/git.sh rename to vcs/git/sh/alias.d/git.sh diff --git a/vcs/.config/zsh/completions/_gitignore b/vcs/gitignore/config/zsh/completions/_gitignore similarity index 100% rename from vcs/.config/zsh/completions/_gitignore rename to vcs/gitignore/config/zsh/completions/_gitignore diff --git a/vcs/.local/bin/gitignore b/vcs/gitignore/local/bin/gitignore similarity index 100% rename from vcs/.local/bin/gitignore rename to vcs/gitignore/local/bin/gitignore diff --git a/vcs/.config/jj/config.toml b/vcs/jj/config.toml similarity index 100% rename from vcs/.config/jj/config.toml rename to vcs/jj/config.toml