aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vcs/gitconfig.ini (renamed from git/gitconfig.ini)5
-rw-r--r--vcs/hgrc.ini (renamed from hgrc.ini)0
2 files changed, 4 insertions, 1 deletions
diff --git a/git/gitconfig.ini b/vcs/gitconfig.ini
index 578a0133..c4c4a517 100644
--- a/git/gitconfig.ini
+++ b/vcs/gitconfig.ini
@@ -36,7 +36,7 @@
[alias]
sha = rev-parse HEAD
sha7 = ! git sha | head -c 7
- prune-branches = !git branch --merged | grep -v master | xargs git branch -d
+ prune-branches = !git branch --merged | grep -v main | xargs git branch -d
sync = !git annex sync s3 && git annex sync origin
tarball = !git-tarball.sh
[annex]
@@ -65,3 +65,6 @@
path = ~/annex/secret/Git/gitconfig.ini
[init]
defaultBranch = main
+[tar "tar.xz"]
+ command = xz -c
+# git config format.signOff yes
diff --git a/hgrc.ini b/vcs/hgrc.ini
index 656f40ba..656f40ba 100644
--- a/hgrc.ini
+++ b/vcs/hgrc.ini