git: update configuration

4 files changed, 23 insertions, 2 deletions

diff --git a/gitconfig b/gitconfig
index 51c96a2..1aa8898 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,15 +1,17 @@
 [user]
 	name = Karel Kočí
 	email = cynerd@email.cz
-	signingkey = A6BC8B8CEB31659B
+	signingkey = B8788B4BCF4F1190288F95C0FCEF2F764FA7A632
 [core]
 	editor = nvim
 	excludesfile = /home/cynerd/.gitignore
+	fsmonitor = true
 [checkout]
 	defaultRemote=origin
 [fetch]
 	recurseSubmodules = true
 	parallel = 8
+	writeCommitGraph = true
 [pull]
 	rebase = true
 [push]
@@ -23,13 +25,22 @@
 [merge]
 	tool = vimdiff
 [mergetool "vimdiff"]
-  cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
+	cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
+[rebase]
+	updateRefs = true
+[rerere]
+	enabled = true
+[branch]
+	sort = committerdate
+[maintenance]
+	strategy = incremental
 [alias]
 	co = checkout
 	ci = commit
 	st = status
 	br = branch
 	wt = worktree
+	sta = stash --all
 	type = cat-file -t
 	dump = cat-file -p
 	please = push --force-with-lease
@@ -43,3 +54,8 @@
 	confirm = always
 [init]
 	defaultBranch = master
+[column]
+	ui = auto
+
+[includeIf "gitdir:~/elektroline/"]
+	path = ~/.gitconfig-elektroline
diff --git a/gitconfig-elektroline b/gitconfig-elektroline
new file mode 100644
index 0000000..1c673d3
--- /dev/null
+++ b/gitconfig-elektroline
@@ -0,0 +1,4 @@
+[user]
+	name = Karel Kočí
+	email = kkoci@elektroline.cz
+	signingkey = B8788B4BCF4F1190288F95C0FCEF2F764FA7A632
diff --git a/install b/install
index 4004103..dff58e9 100755
--- a/install
+++ b/install
@@ -24,6 +24,7 @@ fi
 
 if ask "git" "Install GIT configuration"; then
 	inst gitconfig ~/.gitconfig
+	inst gitconfig-elektroline ~/.gitconfig-elektroline
 	inst gitignore ~/.gitignore
 fi
 
diff --git a/private b/private
-Subproject 166859293d7f610d90bab4bb0307c83ea67fc9d
+Subproject 07839bc4748f841f9134a81475b42f8f4c2053c