Begin migration of orgzly files to git.

master
Jacopo De Simoi 2 years ago
parent b340c21c58
commit dc8f03e2eb
  1. 3
      .gitmodules
  2. 1
      git-auto-commit-mode
  3. 12
      global.org

3
.gitmodules vendored

@ -151,3 +151,6 @@
[submodule "orgit"] [submodule "orgit"]
path = orgit path = orgit
url = https://github.com/magit/orgit.git url = https://github.com/magit/orgit.git
[submodule "git-auto-commit-mode"]
path = git-auto-commit-mode
url = https://github.com/ryuslash/git-auto-commit-mode.git

@ -0,0 +1 @@
Subproject commit a7b59acea622a737d23c783ce7d212fefb29f7e6

@ -1140,7 +1140,8 @@
"~/org/orgzly/hack.org" "~/org/orgzly/hack.org"
"~/org/orgzly/library.org" "~/org/orgzly/library.org"
"~/org/kaizen.org" "~/org/kaizen.org"
"~/org/orgzly/refile.org")) "~/org/orgzly/refile.org"
"~/clones/orgzly/refile-git.org"))
#+end_src #+end_src
Use less verbose reminders: Use less verbose reminders:
#+begin_src emacs-lisp #+begin_src emacs-lisp
@ -1614,6 +1615,9 @@
overwrite your changes." overwrite your changes."
(interactive) (interactive)
(message "Reverting Orgzly buffers…") (message "Reverting Orgzly buffers…")
; pull from remote
(let ((default-directory "~/clones/orgzly"))
(or (eq 0 (shell-command "git pull origin master")) (call-interactively #'magit-status)))
(save-excursion (save-excursion
(save-window-excursion (save-window-excursion
(dolist (b (buffer-list)) (dolist (b (buffer-list))
@ -1622,9 +1626,15 @@
(with-current-buffer b (string-match-p "orgzly" default-directory))) (with-current-buffer b (string-match-p "orgzly" default-directory)))
(pop-to-buffer-same-window b) (pop-to-buffer-same-window b)
(revert-buffer t 'no-confirm))))) (revert-buffer t 'no-confirm)))))
(org-agenda-redo-all)) (org-agenda-redo-all))
(define-key org-agenda-mode-map (kbd "Z") 'org-revert-all-orgzly-buffers) (define-key org-agenda-mode-map (kbd "Z") 'org-revert-all-orgzly-buffers)
#+end_src #+end_src
Use gac
#+begin_src emacs-lisp
(require 'git-auto-commit-mode)
(setq gac-automatically-push-p t)
#+end_src
*** Hydras for timestamps *** Hydras for timestamps
#+begin_src emacs-lisp #+begin_src emacs-lisp
(defun hydra-timestamp/hl-paren-force-fix () (defun hydra-timestamp/hl-paren-force-fix ()

Loading…
Cancel
Save