Anton Melnikov johnny-b-good

## git-selective-merge.md

      
              1 file
            
          
              52 forks
            
          
              45 comments
            
          
              269 stars
            
          
                katylava
                / git-selective-merge.md
            
            
              Last active
              February 27, 2024 10:18
            
              
                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.

  
## pubsub-simple.js
var pubsub = {};
(function(q) {
    var topics = {}, subUid = -1;
    q.subscribe = function(topic, func) {
        if (!topics[topic]) {
            topics[topic] = [];
        }
        var token = (++subUid).toString();
        topics[topic].push({
            token: token,

## Default (OSX).sublime-keymap -- User
  { "keys": ["home"], "command": "move_to", "args": {"to": "bol"} },
  { "keys": ["end"], "command": "move_to", "args": {"to": "eol"} }

## index.html
<!doctype html>
<html ng-app="project">
<head>
	<title>Angular: Service example</title>
	<script src="http://code.angularjs.org/angular-1.0.1.js"></script>
	<script>
var projectModule = angular.module('project',[]);

projectModule.factory('theService', function() {
	return {

## gist:3639232
// Source: https://groups.google.com/forum/#!topic/angular/hVrkvaHGOfc
// jsFiddle: http://jsfiddle.net/pkozlowski_opensource/PxdSP/14/
// author: Pawel Kozlowski

var myApp = angular.module('myApp', []);

//service style, probably the simplest one
myApp.service('helloWorldFromService', function() {
    this.sayHello = function() {
        return "Hello, World!"

## node-0mq-ctrl-c.js
// Show how to handle Ctrl+C in Node.js

var zmq = require('zmq')
  , socket = zmq.createSocket('rep');

socket.on('message', function(buf) {
  // echo request back
  socket.send(buf);
});

## пше
#!/usr/bin/env python
# -*- mode: python, coding: utf-8 -*-
#
# This incredible piece of code makes git a bit Polish, a bit Western Ukrainian,
# пше прошу пана
# Joke is based on fact that 'git' is 'пше' in qwerty/йцукен layouts
#
# (c) 2013 Alexander Solovyov under terms of WTFPL

import sys

## .bash_aliases
function пше () {
    case $1 in
        курва )
            shift;
            git commit $@;;

## github_multiple-accounts.md

      
              1 file
            
          
              37 forks
            
          
              22 comments
            
          
              119 stars
            
          
                JoaquimLey
                / github_multiple-accounts.md
            
            
              Last active
              April 30, 2023 22:17
            
              
                How to Work with GitHub and Multiple Accounts
              
          
    Step 1 - Create a New SSH Key

We need to generate a unique SSH key for our second GitHub account.
ssh-keygen -t rsa -C "your-email-address"
Be careful that you don't over-write your existing key for your personal account. Instead, when prompted, save the file as id_rsa_COMPANY. In my case, I've saved the file to ~/.ssh/id_rsa_work.
Step 2 - Attach the New Key


## Frame.js
class Frame extends Component {
  componentDidMount() {
    this.iframeHead = this.node.contentDocument.head
    this.iframeRoot = this.node.contentDocument.body
    this.forceUpdate()
  }

  render() {
    const { children, head, ...rest } = this.props
    return (
	var pubsub = {};
	(function(q) {
	var topics = {}, subUid = -1;
	q.subscribe = function(topic, func) {
	if (!topics[topic]) {
	topics[topic] = [];
	}
	var token = (++subUid).toString();
	topics[topic].push({
	token: token,
	{ "keys": ["home"], "command": "move_to", "args": {"to": "bol"} },
	{ "keys": ["end"], "command": "move_to", "args": {"to": "eol"} }
	<!doctype html>
	<html ng-app="project">
	<head>
	<title>Angular: Service example</title>
	<script src="http://code.angularjs.org/angular-1.0.1.js"></script>
	<script>
	var projectModule = angular.module('project',[]);

	projectModule.factory('theService', function() {
	return {
	// Source: https://groups.google.com/forum/#!topic/angular/hVrkvaHGOfc
	// jsFiddle: http://jsfiddle.net/pkozlowski_opensource/PxdSP/14/
	// author: Pawel Kozlowski

	var myApp = angular.module('myApp', []);

	//service style, probably the simplest one
	myApp.service('helloWorldFromService', function() {
	this.sayHello = function() {
	return "Hello, World!"
	// Show how to handle Ctrl+C in Node.js

	var zmq = require('zmq')
	, socket = zmq.createSocket('rep');

	socket.on('message', function(buf) {
	// echo request back
	socket.send(buf);
	});
	#!/usr/bin/env python
	# -- mode: python, coding: utf-8 --
	#
	# This incredible piece of code makes git a bit Polish, a bit Western Ukrainian,
	# пше прошу пана
	# Joke is based on fact that 'git' is 'пше' in qwerty/йцукен layouts
	#
	# (c) 2013 Alexander Solovyov under terms of WTFPL

	import sys
	function пше () {
	case $1 in
	курва )
	shift;
	git commit $@;;
	class Frame extends Component {
	componentDidMount() {
	this.iframeHead = this.node.contentDocument.head
	this.iframeRoot = this.node.contentDocument.body
	this.forceUpdate()
	}

	render() {
	const { children, head, ...rest } = this.props
	return (