]> git.bundesbrandschatzamt.de Git - emacsconfig.git/commitdiff
Add bba-pull.
authorAndreas Gerler <baronNOSPAMbundesbrandschatzamt.de>
Tue, 22 Jan 2019 14:45:00 +0000 (15:45 +0100)
committerAndreas Gerler <baronNOSPAMbundesbrandschatzamt.de>
Tue, 22 Jan 2019 14:45:00 +0000 (15:45 +0100)
Signed-off-by: Andreas Gerler <baronNOSPAMbundesbrandschatzamt.de>
bba.org

diff --git a/bba.org b/bba.org
index 6e9794f8655e39f7fc487ba841301669430af9ea..7246a28eaa53a42e154f039dc4b83c284fafae66 100644 (file)
--- a/bba.org
+++ b/bba.org
@@ -307,8 +307,17 @@ Display open TODO items in magit-status.
 #+END_SRC
 
 * [[https://github.com/larstvei/Focus][focus]]
+do a stash, pull, pop.
+in the end use magit-stash.
 
 focus on the important stuff.
+#+BEGIN_SRC emacs-lisp :tangle yes
+  (defun bba-pull ()
+    "Do git stash, pull, pop"
+    (interactive)
+    (shell-command "git stash; git pull; git stash pop")
+    )
+#+END_SRC
 
 #+BEGIN_SRC emacs-lisp :tangle yes
   (if (>= emacs-major-version 24)