Since this is completely relevant I don't feel terrible at all about pimping my essay about the Bridge between Emacs, Clozure CL, and the Apple Foundation Framework.

http://msnyder.info/posts/2012/05/icloud-reminders-orgmode/

Thanks for writing this fairly exhaustive walk through. No need to feel terrible.

You're probably looking for cheat. http://cheat.errtheblog.com/

.gitconfig is your friend: https://gist.github.com/1706237

That looks useful, but some comments would be nice. What do u, ud, and prep do?

`git u $branch` checks out $branch, updates it against whatever remote it's synced to, and then attempts to rebase the current branch against it. `git ud $branch` does the same think, except it also performs the merge of the current branch onto $branch.

`git prep` Simply greps the commit for use of Python/JS print debugging statements, things that shouldn't make it into the codebase.

For those concerned about the total costs: Don't worry. Looks like there's a bit of a discount at the higher levels. http://i.imgur.com/8A9Dx.png

I would recommend tig for this sort of thing: http://jonas.nitro.dk/tig/ In fact, I can't recommend it highly enough. It's typically just as necessary as git on any machine I'm working on.

Thank you so much for this. This immediately replaced my usage of org-velocity. I used this function to convert my (10,000 line) velocity.org file into separate files for Deft:

  (defun generate-files-from-velocity (buffername)
    (save-excursion
      (switch-to-buffer buffername)
      (org-map-entries (lambda ()
                         (progn
                           (org-mark-subtree)
                           (if (and (= 1 (org-outline-level)) (org-export-get-title-from-subtree))
                               (let* ((title (downcase (org-export-get-title-from-subtree)))
                                      (filename (replace-regexp-in-string " " "-" (concat title ".org"))))
                                 (append-to-file (region-beginning) (region-end) (concat "~/Documents/Org/Notes/" filename)))))))))
  
  (generate-files-from-velocity "velocity.org")

I haven't used either of these, but they seem to fill a useful niche. What do you find are the pros and cons of deft vs. org-velocity?

The advantage for me is entirely in terms of separating notes into separate files; something that Deft does and org-velocity isn't really built for. I was planning on implementing something like that for org-velocity, but with the arrival of Deft I no longer have to.