From a965137b4b6fe572f4f5daee467000dd8404200c Mon Sep 17 00:00:00 2001
From: fpi
Date: Wed, 15 Jul 2020 21:53:02 +0200
Subject: Add a script to pull from origin with rebase

---
 Makefile   | 6 ++++++
 README.org | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/Makefile b/Makefile
index a3a7693..92b04f5 100644
--- a/Makefile
+++ b/Makefile
@@ -8,3 +8,9 @@ tangle:
 
 link:
 	tangle/link.sh
+
+fetch:
+	git fetch
+
+pull:
+	tangle/pull.sh
diff --git a/README.org b/README.org
index 34ca2b7..c199c9e 100644
--- a/README.org
+++ b/README.org
@@ -25,6 +25,14 @@ git branch -a | grep -v -e +$ -e master | sed "s/[ *] //" | xargs git merge
 git push --force origin master
 #+end_src
 
+To integrate changes from =origin= perform a rebase instead of merge
+to loose the old merge commit but keep any local changes.
+
+#+begin_src shell :shebang "#!/bin/bash" :tangle tangle/pull.sh
+git fetch
+git rebase origin/master master
+#+end_src
+
 ** Updating all tangled files
 This script (re-)tangles all =.org= and =.org.gpg= files in the
 current directory. Run this in case the org files were updated outside
-- 
cgit v1.2.3