branch: master
commit ffe247b86d2147c75e03682825432944bd127ae7
Author: Tino Calancha <tino.calan...@gmail.com>
Commit: Tino Calancha <tino.calan...@gmail.com>
* gited.el (gited-do-sync-with-trunk): Go to branch before
`gited-sync-with-trunk'.
---
packages/gited/gited.el | 2 ++
1 file changed, 2 insertions(+)
diff --git a/packages/gited/gited.el b/packages/gited/gited.el
index e84e33b..4e1b891 100644
--- a/packages/gited/gited.el
+++ b/packages/gited/gited.el
@@ -2221,6 +2221,7 @@ tracking a remote repository"))
(message "Successfully applied and committed %d commits!"
num-commits))))
+;; FIXME: This command changes the current branch. Should be preserved?
(defun gited-do-sync-with-trunk (&optional dont-ask)
"Run `gited-sync-with-trunk' in the marked branches.
If optional arg DONT-ASK is non-nil, then do not prompt user for the
@@ -2237,6 +2238,7 @@ Called interactively with a prefix set DONT-ASK to
non-nil."
(completing-read
prompt (gited-listed-branches)
nil nil def))))
+ (gited-goto-branch br)
(gited-sync-with-trunk target)))
(gited-update))
