Designer/developer fascinated by the promise of the web. Front end proficiency strong. Some excursions through full-stack development/deployment. Four years running successful freelance business. Youth educator in media-literacy focussed summer program. Fascinated by the way we use technology to engage with the world around us. Philosophy B.A. with breadth and depth of hands-on technical experience in design, complex problem-solving and analysis, and online technologies. Managerial and team experience as editor of student publications. Occasional musician.
David Miller Orangetronic
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
| /* | |
| * packages/reststop2/auth.js | |
| * Add a method to handle OPTIONS request | |
| */ | |
| // return nothing | |
| RESTstop.add('login', {'method': 'OPTIONS'}, function() {}) |
Orangetronic
/ gist:9997325
Last active
August 29, 2015 13:58
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.