From ea214c16db999ddab9c7d43fa30b645e6d46e616 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko.korhonen@rossum.fi>
Date: Tue, 18 May 2021 09:03:12 +0300
Subject: [PATCH 1/2] Add rebase merges to gitconfig

---
 home/.gitconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/.gitconfig b/home/.gitconfig
index 9734926e..8be410c2 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -28,4 +28,4 @@
 	cmd = nvim -d -c 'set nomodifiable'
 
 [pull]
-	rebase = false
+	rebase = merges

From 05cd37b757aeac576e9699af03acf0112820aa46 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko.korhonen@rossum.fi>
Date: Tue, 18 May 2021 09:03:34 +0300
Subject: [PATCH 2/2] Add media profile to mko-laptop

---
 config.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config.yaml b/config.yaml
index c2186244..68335dc7 100644
--- a/config.yaml
+++ b/config.yaml
@@ -245,6 +245,7 @@ profiles:
   mko-laptop:
     include:
     - terminal
+    - media
   Edoras:
     include:
     - terminal