Skip to content

Instantly share code, notes, and snippets.

View craighurley's full-sized avatar

Craig Hurley craighurley

15 followers · 12 following
  • New Zealand
View GitHub Profile
@robmccormack
robmccormack / mrm_show_quick_panel.py
Created July 19, 2013 17:19
Examples of using custom quick_panels in Sublime Text 2 / 3
import sublime_plugin
import datetime
'''
__ __ __ __
| \/ |_ _| \/ |
| |\/| | '_| |\/| |_
|_| |_|_| |_| |_(_)
Project: Examples of using show_quick_panel in Sublime 2
@katylava
katylava / git-selective-merge.md
Last active February 11, 2026 09:00
git selective merge

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.