-
This is a numbered list.
-
I'm going to include a fenced code block as part of this bullet:
Code More Code
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# The below suppressions suppress just about every entry that pango | |
# libraries could have contributed to. This is likely excessive... ;) | |
# | |
# We make good use of the wildcarding features of Valgrind. By using | |
# wildcarded library object filenames we can hope this source is | |
# portable to more systems. | |
# On one tested system (Ubuntu 14.04), these libraries are: | |
# /usr/lib/x86_64-linux-gnu/libpangocairo-1.0.so.0.3600.3 | |
# /usr/lib/x86_64-linux-gnu/libpangoxft-1.0.so.0.3600.3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
var source = require('vinyl-source-stream'); | |
var gulp = require('gulp'); | |
var gutil = require('gulp-util'); | |
var browserify = require('browserify'); | |
var reactify = require('reactify'); | |
var watchify = require('watchify'); | |
var notify = require("gulp-notify"); | |
var scriptsDir = './scripts'; | |
var buildDir = './build'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
---------- Forwarded message ---------- | |
From: Mark S. Miller <erig...@google.com> | |
Date: Tue, Nov 16, 2010 at 3:44 PM | |
Subject: "Future of Javascript" doc from our internal "JavaScript Summit" | |
last week | |
To: java...@google.com | |
On November 10th and 11th, a number of Google teams representing a variety | |
of viewpoints on client-side languages met to agree on a common vision for | |
the future of Javascript. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Notes for installing on Samsung Series 9 | |
# UEFI boot: LVM on LUKS | |
# | |
# See the full blog post: | |
# http://jasonwryan.com/blog/2013/01/25/uefi/ | |
# check you are booted in uefi | |
modprobe efivars | |
ls /sys/firmware/efi/vars |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#import <Foundation/Foundation.h> | |
@interface NSObject (MDeallocObserver) | |
- (void)addDeallocObserverBlock:(void (^)(void))block; | |
- (void)addDeallocObserverWithKey:(id<NSCopying>)key block:(void (^)(void))block; | |
- (void)removeDeallocObserverForKey:(id<NSCopying>)key; | |
@end |
Update 2022: git checkout -p <other-branch>
is basically a shortcut for all this.
FYI This was written in 2010, though I guess people still find it useful at least as of 2021. I haven't had to do it ever again, so if it goes out of date I probably won't know.
Example: You have a branch refactor
that is quite different from master
. You can't merge all of the
commits, or even every hunk in any single commit or master will break, but you have made a lot of
improvements there that you would like to bring over to master.
Note: This will not preserve the original change authors. Only use if necessary, or if you don't mind losing that information, or if you are only merging your own work.