Wilmar van Heerden wilmarvh

GIT: How to extract a specific folder from a git repository branch, including the folder's related git history only

NOTE: If you want to keep the history for a specific folder in the master branch, just skip steps in lines 3,4,5,6,7

git clone <git-repository-url>
cd <git-repository-dir>

git checkout <branch-name>              # line 3; Checkout the branch of interest
git merge --strategy=ours master        # line 4; keep the content of this branch only and record a merge
git checkout master                     # line 5; Go back to the master branch

Principles of Adult Behavior

Be patient. No matter what.
Don’t badmouth: Assign responsibility, not blame. Say nothing of another you wouldn’t say to him.
Never assume the motives of others are, to them, less noble than yours are to you.
Expand your sense of the possible.
Don’t trouble yourself with matters you truly cannot change.
Expect no more of anyone than you can deliver yourself.
Tolerate ambiguity.
Laugh at yourself frequently.

Following the tradition from last year, here's my complete list of all interesting features and updates I could find in Apple's OSes, SDKs and developer tools that were announced at this year's WWDC. This is based on the keynotes, the "What's New In ..." presentations and some others, Apple's release notes, and blog posts and tweets that I came across in the last few weeks.

If for some reason you haven't watched the talks yet, I really recommend watching at least the "State of the Union" and the "What's New In" intros for the platforms you're interested in. The unofficial WWDC Mac app is great way to download the videos and keep track of what you've already watched.

If you're interested, here are my WWDC 2015 notes (might be useful if you're planning to drop support for iOS 8 now and start using some iOS 9 APIs).

OSX → macOS 10.12 Sierra

Install MySQL on macOS Sierra

This procedure explains how to install MySQL using Homebrew on macOS Sierra 10.12

Install Homebrew

Installing Homebrew is effortless, open Terminal and enter :
$ /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
Note: Homebrew will download and install Command Line Tools for Xcode 8.0 as part of the installation process.

Install MySQL

At this time of writing, Homebrew has MySQL version 5.7.15 as default formulae in its main repository :

	post_install do \|installer\|
	app_plist = "Emergence/Info.plist"
	plist_buddy = "/usr/libexec/PlistBuddy"
	version = `#{plist_buddy} -c "Print CFBundleShortVersionString" #{app_plist}`.split
	puts "Updating CocoaPods' version numbers to #{version}"

	installer.pods_project.targets.each do \|target\|
	`#{plist_buddy} -c "Set CFBundleShortVersionString #{version}" "Pods/Target Support Files/#{target}/Info.plist"`
	end
	end

	COMPACT WIDTH (stacked view)

	- 320 x 568 pt
	-> iPhone 5, 5s
	- 320 x 768 pt
	-> iPad 9.7" Split Landscape 2/3 right
	- 320 x 834 pt
	-> iPad 10.5" Split Landscape 2/3 right
	- 320 x 1024 pt
	-> iPad 9.7" Split Portrait right

	import Foundation

	public typealias JSON = AnyObject

	public func JSONWithData(data: NSData) -> JSON? {
	do {
	let j = try NSJSONSerialization.JSONObjectWithData(data, options: [])
	return j
	} catch _ {
	return nil

	PSPDF_EXTERN BOOL PSPDFIsMainThread(void) {
	// dispatch_get_current_queue is deprecated because most of the time it's not a good idea to call it.
	// NSThread.isMainThread simply calls pthread_main_np so we can save a bit if we call it directly.
	PSPDF_DEPRECATED_NOWARN(return pthread_main_np() \|\| dispatch_get_current_queue() == dispatch_get_main_queue();)

	# The trick is to link the DeviceSupport folder from the beta to the stable version.
	# sudo needed if you run the Mac App Store version. Always download the dmg instead... you'll thank me later :)

	# Support iOS 15 devices (Xcode 13.0) with Xcode 12.5:
	sudo ln -s /Applications/Xcode-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/DeviceSupport/15.0 /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/DeviceSupport

	# Then restart Xcode and reconnect your devices. You will need to do that for every beta of future iOS versions

	# (A similar approach works for older versions too, just change the version number after DeviceSupport)

	The primary goal is to swap command and option.

	The secondary goal is to remap Caps Lock to Control.

	The tertiary goal is to share modifier keys across keyboards, so you can emacs with two keyboards.

	The following instructions are good as of 2016-08-24, for OS X El Capitan 10.11.6.
	Mac OS Sierra broke Seil support; Seil instructs us to consider Karabiner Elements.
	But when Karabiner Elements swaps command and option, it does it for all keyboards;
	meaning the native keyboard also gets its command and option swapped, which is bad!