From: Andreas Gerler Date: Tue, 22 Jan 2019 14:45:00 +0000 (+0100) Subject: Add bba-pull. X-Git-Url: http://git.bundesbrandschatzamt.de/?a=commitdiff_plain;h=058e79a21680ea2c4466f5281042e0f951d14a9b;p=emacsconfig.git Add bba-pull. Signed-off-by: Andreas Gerler --- diff --git a/bba.org b/bba.org index 6e9794f8..7246a28e 100644 --- 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)