Showing all posts by jeffblog

In Uncategorized

Git “feature branch” alias

Author jeffblogPosted on 2 Comments

git aliases are useful command-line shortcuts to save a minute or two here and there while working with your version-controlled source code (or other data).

Here’s one I’ve been using recently in case it saves you time too. It creates and checks out a new branch based on the latest code in the configured HEAD / upstream branch on the origin remote.

To use it, just add the following line to your `~/.gitconfig`

[alias]
        default = "!git remote show origin | grep 'HEAD branch:' | cut -d ' ' -f 5"
        fb = "!git fetch origin && git checkout -t origin/$(git default) -b"

To use this, you can run these aliased commands in a repository directory:

  • git default to get the default remote branch.
  • git fb try/some-new-feature to create a new feature branch based on the remote default branch. (fb is short for “feature branch,” of course).

EDITED

  • 2022-12-30 to add the separate default alias I’ve been using as well.
  • 2020-07-21 to continue to work with repositories that have moved away from calling the default branch master (Github is changing the default).
In Animals, Plants

Pruning

Author jeffblogPosted on 1 Comment

When we lost our elder cat last year, we planted a tree that goes by many names to honor his memory.

My brother’s family adopted a kitty from the same litter as we did and they named her Kiri. We followed suit calling ours a name that means “Tangerine” in Japanese. Mikan was a deeply-vibrant shade of orange and Stacy and I are both long-time Led Zeppelin fans, so the name was pretty fitting.

We bought the tree from spectacular local nursery / landscape designer, Earth Works, and it has done really well where we planted it.

Stacy mentioned yesterday that she saw some small tangerines on the tree. I’ve read that you are supposed to trim the fruit for the first few years so the roots can take and the plant can spend its energy developing a strong canopy, so I dutifully went out to trim them. I was truly surprised to see how many fruits there were!

Hopefully, it’ll be “big enough” next year to convince me to leave a few to ripen! If this was any indication, there should be a lot of them.

It’s not a complete loss, though, as I discovered that the tiny citrus makes a nice, zesty garnish for sparkling water 😻