Once upon a time you found a project on Github that caught your fancy and you made a fork of your very own. You made some changes and time passed. Now you realize that the original project has some new features you want in your fork. What to do?
##Step 1
Add a remote to the original, or upstream project.
$ git remote add upstream git://github.com/originalOwner/project.gitYou can confirm the remote with this command:
$ git remote -vThere will (at least) be a pair of references to origin (your fork of the project) and a pair of references to upstream, the new remote you’ve added for the upstream project.
##Step 2 Fetch all the changes from the upstream project. This will gather all the branches of that upstream project.
$ git fetch upstream##Step 3 Make sure you are on the master branch of your local repository:
$ git checkout master##Step 4 Rebase your branch so that any changes you’ve made which aren’t in the upstream repository are replayed, thus preventing you from losing them.
$ git rebase upstream/master##Step 5
Push your newly updated local repository to your Github fork. You may need to add the -f flag to force the push on the initial push after a rebase.
$ git push [-f] origin master
{{ “0451237900” | amazon_mediumleft_image }} Trust Your Eyes is the first book by Linwood Barclay I’ve ever read. It won’t be the last. Filled with plots twists and turns, including a startling revelation in the very last paragraph, I thoroughly enjoyed Trust Your Eyes.
I’ll be working my way through his eleven other books just a quickly as I can get them.
What happens when you plot a point for every person captured in the census? You get a map.
{{ “0451411080” | amazon_mediumleft_image }} Book one of 2013 is one I’ve had on my shelf for several years but never read. Starting with a large number of facts Christopher Hyde weaves a good story around a possible movie of the execution of the Romanov family. Sometimes truth is stranger than fiction, and when you can blur the lines between the two, you get a good espionage tale.
With the turn of a new year I was curious how many postings I made in the past 12 months, and how many words I had written on my sites.
Counting the number of postings is simple, it’s just the number of files in my _posts folder.
$ cd path/to/source/_posts
$ ls -l | grep 2012 | wc -lCounting the number of words contained in those files with a 2012 in the name was a bit trickier, but a couple of searches and two Stack Overflow answers combined gave me this:
$ cd path/to/source/_posts
$ find . -name "*2012*" -maxdepth 1 -print0 | xargs -0 cat | wc -wArmed with these two commands I decided it would be fun to see, year by year, the number of postings made and words written.
My Cello site is much younger, but here are the year by year statistics for it as well.
Combined, I’ve written 2,274 posts containing 693,865 words.
If we pick the Houston population density model, my wife and I don’t even have to move.
A month ago I had foot surgery to remove several bone spurs from the base knuckle of my big toe. For the past several years I’ve had near constant pain from these arthritis-caused growths in my right foot. Some days the pain was great enough to make me limp, other days it was only a minor annoyance.
The surgery appears to have been a complete success. While my foot is still slightly swollen I have not experienced any of the pain to which I had become accustomed.
The first two weeks of my recovery were spent with my foot elevated. The gauze bandages and elastic wrap that were applied in surgery weren’t removed until day 14. The gauze was tight enough that more than a few minutes with my foot down were very painful. Once the stitches were out I was able to get around more normally; still wearing the post-op shoe which is stiff enough to protect my swollen toe.
The past two weeks (week 3 and 4) have seen me return to a more normal lifestyle. I’ve stopped wearing the post-op shoe at night - which immensely improved my ability to sleep comfortably - and I returned to work the week prior to the Christmas break. I can drive, walk, even shovel snow on the driveway. I still ice my foot some to help with the swelling.
The last of the scabs (from the stitches) has come off, so now I can start to massage the incision line and surrounding area to help prevent scar tissue build up. The incision itself is barely visible. It’s a thin red line that has no texture to it at all. Twelve years ago I had an umbilical hernia repaired and that surgery left a three inch long scar that is fibrous and quite visible. I was pleasantly surprised to see how minimal this new scar is at first glance.
I have managed to stick my foot into regular shoes a couple of times in the last day or two. However after a few minute the shoe began to feel too tight. When I return to work later this week I expect I’ll still be using the post-op shoe. Or maybe start with a regular shoe but have the post-op shoe on hand for when my foot begins to complain.
Over the next few weeks I’ll be massaging the joint and surrounding tissue, and starting to exercise my foot again beginning with short walks. I hope to start using our treadmill again soon, and I am looking forward to pain-free bicycling later in the spring.
Since my bone spurs were likely caused by arthritis there is a chance they could return. From the time I first had recurring pain in my big toe until now has been about 10 or 12 years. Even if I have to repeat this surgery in a decade I will be very pleased and consider it a success. And who knows, in a decade there may be an even better treatment option.
Some of these are stunning, not only for their style but for their construction method. A living bridge that maybe 500 years old? A canal in a bridge? Wow.
December 17, 1903: Perhaps the single greatest picture ever taken.
It’s been a long while since I posted anything here, so for lack of a better topic, here’s a list of the 47 tabs currently open in my browser.
Mint - Site visit statistics for my sites
Google Calendar - Sibylle and I make use of Google calendar every single day
Google Drive - Use to be Google Docs. Currently open as we are creating the annual Christmas letter
Christmas Letter - Not actually going to link to this, but it’s open in a tab as well
Github - my collection of git repositories at Github
Typing Practice for Programmers - Had this open for weeks now, should try it sometime
Music for Geeks and Nerds | Errata - Book about music theory and programming I bought and ned to start
zsh-syntax-highlighting - plugin for zsh that adds syntax highlighting to the command line
Perfect Workflow in Sublime Text 2 - excellent set of videos covering the Sublime Text 2 text editor
The Homely Mutt - Fantastically detailed set of instructions in setting up and using mutt for email
Commanding your Text Editor - Comparative shortcuts for commonly performed actions
Migrating from Kindle to iBooks - How to use Calibre to remove DRM from most eBooks
Everything you wanted to know about DRM and eBooks - More about DRM
Quartz - some kind of aggregator site I haven’t explored yet
Private by Default - posting about switching a site from http to https
Profiling Vimscript performance - The latest in the excellent Vim casts series
Explorations in Unix - using Unix command line tools for statistical analysis
Music Theory - online music theory exercises
Chords and Double Stopping - interesting thoughts on playing chords and double stops on the cello
Managing Ruby: Moving from RVM to rbenv - I’m tempted to switch from RVM to rbenv
Rubies and Bundles - more on managing Ruby dependencies
Dashing - an open-source dashboard framework
Crash Course in Objective-C for iOS 6 - Objective-C continues to fascinate me
Simple Guide to Phrasing - thoughts about phasing in music
Tea Bag Buddy - stocking stuffer idea for the tea drinker in your life
How Pythonista Changed My Workflow - article about writing Python scripts for iOS
See how long a given process has been running - hint on creating a bash script for monitoring a process
Top 30 NMap Commands - tips for using nmap
Using Slate: A hacker’s window manager for Macs - a how to for using the open source Mac window manager Slate
ScriptKit - Drag and Drop Programming for iPad - nifty tool for programming on iPads
ScriptKit - actual site for ScriptKit
Layouts - window management using Alfred and AppleScripts
heard - source for heard, an open-source project that tracks what music you listen to
Heard - project page for Heard
Take your computer back from your mouse - article on using Alfred
Build a Killer Customized Arch Linux Installation - nuts and bolts approach to customizing a Linux distro
Beginner’s Guide - Arch - wiki site for Arch Linux help
Style Manual - a stylish style manual
Guardian Maximus - a RAID-1 drive enclosure
Big Nerd Ranch iOS Programming, 3rd Edition - a book I wish to have
Learning Chef - part 1 - set of videos to get started using Chef
Automating System Provisioning and Deployment with Chef - using Chef for system provisioning and application deployment
UICollectionView Custom Layout Tutorial - tutorial on customizing a UICollectionView layout
Bold Poker - poker using iOS devices instead of cards
NSHipster - site with weekly articles about iOS development
Blabbermouth - YES Concert - YES is going on tour next spring
The Midland by AMC - the venue for the YES concert in Kansas City