So you've got a project that's just for yourself, and you've decided to reach out to good ol' git to get the job done.
Perhaps because you like the idea of keeping history as you make changes, or to try things out via branching, or maybe as a simple mechanism to share information across devices.
Here are some things I've used git for.
Some of these I've held with a single repo, sometimes I've had multiple repos for various (especially projects, I've had a bunch of things come and go over the years and sometimes starting off with a clean repo is a great way of approaching things).
I've been using OneNote since around 2003. The first year or so my usage was not very consistent, but at some point during that first year I got into a habit of having one tab per year-month, and one page per day.
I have some tools (that I should probably clean up at some point) that allow me to grab a snapshot of my OneNote files and keep them in a local directory structure. OneNote is wonderful at searching, including within images, but having some of it in git is also nice for cases where either I don't have OneNote on hand or can't log in properly, or for when I want to keep a look at history (although this rarely happens, as the entries in a journal are typically an append-only affair).
What more is there to add here other than the wonder that is magit? Just the user manual by itself provides a ton of information on how to use this effectively and what some of the practical limitations might be.
I still use the command line regularly if I'm working on a different environment, but for all my emacs-based workflows, this is a delight.
To avoid merged history trees, I tend to rebase.
That's usually some combination of fetching and rebasing manuall, like so.
$ git fetch
$ git rebase origin/master
Together with simply shelving in-progress work and then popping it when it's just not ready to commit.
$ git stash
$ git pull
$ git stash pop
Happy git usage!
Tags: git