Daniel Choudhury dac09

## 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.

  
## countries.json
[
  {name: 'Afghanistan', code: 'AF'},
  {name: 'Åland Islands', code: 'AX'},
  {name: 'Albania', code: 'AL'},
  {name: 'Algeria', code: 'DZ'},
  {name: 'American Samoa', code: 'AS'},
  {name: 'AndorrA', code: 'AD'},
  {name: 'Angola', code: 'AO'},
  {name: 'Anguilla', code: 'AI'},
  {name: 'Antarctica', code: 'AQ'},

## index.html
<!doctype html>
<html>
<head>
  <meta charset="utf-8">
  <title>App Redirection</title>
</head>
<body>
  <!--
      NOTE: This was a great hack in days gone by, but now both Apple and Google have improved their support for custom
      protocol handlers.

## Nielsen2012Python_case.py
# $Id: Nielsen2012Python_case.py,v 1.2 2012/09/02 16:55:25 fn Exp $

# Define a url as a Python string (note we are only getting 100 documents)
url = "http://wikilit.referata.com/" + \
    "wiki/Special:Ask/" + \
    "-5B-5BCategory:Publications-5D-5D/" + \
    "-3FHas-20author%3DAuthor(s)/-3FYear/" + \
    "-3FPublished-20in/-3FAbstract/-3FHas-20topic%3DTopic(s)/" + \
    "-3FHas-20domain%3DDomain(s)/" +  \
    "format%3D-20csv/limit%3D-20100/offset%3D0"

## BrowserDetectProtocol.js
<html>
<head>
    <title>Detect Custome Protocol</title>
    <script type="text/javascript" src="http://code.jquery.com/jquery-1.8.1.min.js"></script>
</head>
<body>
<input id="protocol" value="" placeholder="custom protocol"/>
<button id="launch">Launch</button>
<!-- Mozilla Only -->
<iframe id="hiddenIframe" src="about:blank" style="display:none"></iframe>

## gist:6670468
ACTION
AD_HOC_CODE_SIGNING_ALLOWED
ALTERNATE_GROUP
ALTERNATE_MODE
ALTERNATE_OWNER
ALWAYS_SEARCH_USER_PATHS
ALWAYS_USE_SEPARATE_HEADERMAPS
APPLE_INTERNAL_DEVELOPER_DIR
APPLE_INTERNAL_DIR
APPLE_INTERNAL_DOCUMENTATION_DIR

## dokku_setup.md

      
              1 file
            
          
              26 forks
            
          
              3 comments
            
          
              93 stars
            
          
                ungoldman
                / dokku_setup.md
            
            
              Last active
              November 28, 2023 12:35
            
              
                Deploy your own PaaS: Setting up Dokku with DigitalOcean and Namecheap
              
          
    Deploy your own PaaS!

Setting up Dokku with DigitalOcean and Namecheap
..or how I made my own heroku in a few hours for $3.98.

This write-up is several years out of date! You probably shouldn't use it.


## curried.es5.js
function curried(fn) {
    var args = Array.prototype.slice.call(arguments, 1);

    return function() {
        return fn.apply(this, args.concat(Array.prototype.slice.call(arguments, 0)));
    }
}


## nametab.sh
#!/bin/bash

# A simple script which will name a tab in iTerm
# usage:
# $ nametab NewTabName

echo "trying to rename the current tab to $@"
echo -ne "\033]0;"$@"\007"
echo "finished"

## injecting $http in the console
var $inj = angular.injector(['App']);
var serv = $inj.get('$http');

var x = serv({method: 'POST', url: 'http://127.0.0.1:5000'}).success(function(data){console.log(data)}).error(function(data, status, header){ console.log(data); console.log(status); console.log(header);});

console.log(x);
	[
	{name: 'Afghanistan', code: 'AF'},
	{name: 'Åland Islands', code: 'AX'},
	{name: 'Albania', code: 'AL'},
	{name: 'Algeria', code: 'DZ'},
	{name: 'American Samoa', code: 'AS'},
	{name: 'AndorrA', code: 'AD'},
	{name: 'Angola', code: 'AO'},
	{name: 'Anguilla', code: 'AI'},
	{name: 'Antarctica', code: 'AQ'},
	<!doctype html>
	<html>
	<head>
	<meta charset="utf-8">
	<title>App Redirection</title>
	</head>
	<body>
	<!--
	NOTE: This was a great hack in days gone by, but now both Apple and Google have improved their support for custom
	protocol handlers.
	# $Id: Nielsen2012Python_case.py,v 1.2 2012/09/02 16:55:25 fn Exp $

	# Define a url as a Python string (note we are only getting 100 documents)
	url = "http://wikilit.referata.com/" + \
	"wiki/Special:Ask/" + \
	"-5B-5BCategory:Publications-5D-5D/" + \
	"-3FHas-20author%3DAuthor(s)/-3FYear/" + \
	"-3FPublished-20in/-3FAbstract/-3FHas-20topic%3DTopic(s)/" + \
	"-3FHas-20domain%3DDomain(s)/" + \
	"format%3D-20csv/limit%3D-20100/offset%3D0"
	<html>
	<head>
	<title>Detect Custome Protocol</title>
	<script type="text/javascript" src="http://code.jquery.com/jquery-1.8.1.min.js"></script>
	</head>
	<body>
	<input id="protocol" value="" placeholder="custom protocol"/>
	<button id="launch">Launch</button>
	<!-- Mozilla Only -->
	<iframe id="hiddenIframe" src="about:blank" style="display:none"></iframe>
	ACTION
	AD_HOC_CODE_SIGNING_ALLOWED
	ALTERNATE_GROUP
	ALTERNATE_MODE
	ALTERNATE_OWNER
	ALWAYS_SEARCH_USER_PATHS
	ALWAYS_USE_SEPARATE_HEADERMAPS
	APPLE_INTERNAL_DEVELOPER_DIR
	APPLE_INTERNAL_DIR
	APPLE_INTERNAL_DOCUMENTATION_DIR
	function curried(fn) {
	var args = Array.prototype.slice.call(arguments, 1);

	return function() {
	return fn.apply(this, args.concat(Array.prototype.slice.call(arguments, 0)));
	}
	}
	#!/bin/bash

	# A simple script which will name a tab in iTerm
	# usage:
	# $ nametab NewTabName

	echo "trying to rename the current tab to $@"
	echo -ne "\033]0;"$@"\007"
	echo "finished"
	var $inj = angular.injector(['App']);
	var serv = $inj.get('$http');

	var x = serv({method: 'POST', url: 'http://127.0.0.1:5000'}).success(function(data){console.log(data)}).error(function(data, status, header){ console.log(data); console.log(status); console.log(header);});

	console.log(x);