Merge branch 'master' of gitea:FunctionalHacker/dotfiles

Add media profile to mko-laptop
Add rebase merges to gitconfig
2021-05-18 09:03:56 +03:00 · 2021-05-18 09:03:34 +03:00 · 2021-05-18 09:03:12 +03:00
2 changed files with 2 additions and 1 deletions
--- a/config.yaml
+++ b/config.yaml
@ -245,6 +245,7 @@ profiles:
  mko-laptop:
    include:
    - terminal
    - media
  Edoras:
    include:
    - terminal
--- a/home/.gitconfig
+++ b/home/.gitconfig
@ -28,4 +28,4 @@
 	cmd = nvim -d -c 'set nomodifiable'
 [pull]
-	rebase = false
+	rebase = merges
Author	SHA1	Message	Date
Marko Korhonen	cc1fbb151b	Merge branch 'master' of gitea:FunctionalHacker/dotfiles	2021-05-18 09:03:56 +03:00
Marko Korhonen	05cd37b757	Add media profile to mko-laptop	2021-05-18 09:03:34 +03:00
Marko Korhonen	ea214c16db	Add rebase merges to gitconfig	2021-05-18 09:03:12 +03:00