We’re working on a little skunk works project at the office and it involved splitting a Github repository in two. After a successful split, I noticed we’d missed a PR that now impacts both repositories.
My head went to
git format-patch <sha>, but I didn’t recall an option to target a file spec and at first glance it generates a patch for every commit after that SHA.
git show on the other hand definitely advertises an option to filter
git show <sha> -- path/that/moved
Format that as
--pretty=email and you can direct the output to a patch for
git show --pretty=email <sha> -- path/that/moved> pr-for-other-repo.patch
Now we can pull that into our other repo with
git am -3 pr-for-other-repo.patch.
Turns out that
-- path/that/moved semantic does work with
git format-patch. So in the end, we could have just used
git format-patch -1 -- path/that/moved
git am -3 partial-pr.patch
My contribution to theShift: a writing project designed to help us produce and consume unique perspectives on topics relevant to the web industry.
A little over 2 years ago I joined Sparkbox. The focus on community, learning, and teaching were all contributors to that decision. Today we have 4 apprentices (Cat, Bennett, Brittany, and Nate) sitting among our team, double the 2014 cohort and 1 more than 2015. Build Right: Maker Series is looking to broaden our horizons by looking beyond HTML, CSS, and even tech to talk about wearables, physical health, and getting things done.
At home, we ask of our 4 awesome kids to learn an instrument, play a sport, write books or comics, and learn the skills of Scouts. They fight us all the time, but we know that breadth and awareness is as much an ingredient to success as depth.
Personally, I’ve found myself this last year “without the time” to explore things beyond my comfort zone. I’ve not shipped a personal project in over a year. This is my first personal blog post since 2014! I’ve found a rut.
The Web is a reflection of those building it – after all The Web is a collection rather than a singular item. As a matter of building a better web, I’d like to once again make the time to expand my normal by looking outside the web.
As of Elixir 0.13, you’ll need to have Erlang 17 installed. If you use brew to install erlang then elixir you’ll find this message awaiting you:
ERROR: OTP release R16B03-1 does not match required regex (17).*
The current Erlang brew formula is still at R16B03-1. BUT! the development version IS 17. So here you go:
brew install --devel erlang
I’m sure this will change soon, but until then this’ll get you going again.
It’s well understood that Skype does not advocate usability, but I won’t take it anymore. They have some shortcuts, but they’re pretty pitiful.
I’m a left hand dominant shortcut-er. Say what you will about me, but I can’t make my fingers use
CMD+OPTION+F for finding a contact to start a new conversation. So I created the following shortcut.
Back when I started Cincy Clean Coders, it felt like the Dayton community was nearly nonexistent. It seemed like I needed to head down to the big city to attract a community of Clean Coders.
Fast forward 2 years… the Cincy group has stopped meeting, Dayton Clean Coders is going strong (with a bad-ass logo), an Elixir Group is forming, and GemCityJS is growing. There’s Build Guild and others as well. The Dayton tech scene is thriving!
It turns out the people at the center of making much of this happen are also doing great things for the web at Sparkbox by leading the world in responsive web design.
Starting next week I’m excited to join the awesome Sparkbox team, focusing hard on making the web and Dayton community an even more amazing place!
Between the platform shift to open source, Ruby, Rails, etc. and the challenge of working with some of the most passion devs I’ve met, this looks to be an exciting challenge just to keep up!
Microsoft ALM & MVP Community
This move likely means stepping away from the Microsoft ALM & MVP community. These have been some of the most passionate and hard working people I’ve met. They give an immense amount of their time towards helping build great software.
While TFS has it’s fair share of critics, they’re moving in a great direction, fast. And with a leader like Brian Harry making comments like this in private email lists…
I’m not horribly worried about being copied. If we can make the whole world provide better services, I’m happy.
…I have no doubt that set of tools will be in a great place in the coming years.