home

commit e5f93f0daa0ccfd74278588f5f04e75ee65f96db
parent eea45f62320de3837565c019522035cfb66bfadb
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Mon,  3 Oct 2022 10:36:13 +0200

tools/emacs: fetch-and-rebase-from-upstream

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
tools/emacs/config/config-vcs.el
 | 
6
++++++

1 file changed, 6 insertions(+), 0 deletions(-)
diff --git a/tools/emacs/config/config-vcs.el b/tools/emacs/config/config-vcs.el
@@ -95,6 +95,12 @@
   (transient-append-suffix 'magit-push "=m"
     '(1 "=o" "Set push option" "--push-option="))  ;; Will prompt, can only set one extra
 
+  (defun vde/fetch-and-rebase-from-upstream ()
+    ""
+    (interactive)
+    (magit-fetch-all "--quiet")
+    (magit-git-rebase (concat "upstream/" (vc-git--symbolic-ref (buffer-file-name))) "-sS"))
+  
   ;; Hide "Recent Commits"
   (magit-add-section-hook 'magit-status-sections-hook
                           'magit-insert-modules