Lukas Bachschwell s00500

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

  
## ICS.php
<?php

/**
 * This is free and unencumbered software released into the public domain.
 *
 * Anyone is free to copy, modify, publish, use, compile, sell, or
 * distribute this software, either in source code form or as a compiled
 * binary, for any purpose, commercial or non-commercial, and by any
 * means.
 *

## rss-to-pdf.rb
#!/usr/bin/env ruby
# rss-to-pdf.rb
# Author:   Werner Robitza
# Synopsis: A basic console RSS to PDF writer using the prawn library
# Usage:    rss-to-pdf.rb <url>
#           <url> being the URL of the RSS news feed

require 'open-uri'
require 'nokogiri'
require 'pp'

## gist:2999707
<!doctype html>
<title>Site Maintenance</title>
<style>
  body { text-align: center; padding: 150px; }
  h1 { font-size: 50px; }
  body { font: 20px Helvetica, sans-serif; color: #333; }
  article { display: block; text-align: left; width: 650px; margin: 0 auto; }
  a { color: #dc8100; text-decoration: none; }
  a:hover { color: #333; text-decoration: none; }
</style>

## osx-for-hackers.sh
#!/bin/sh

###
# SOME COMMANDS WILL NOT WORK ON macOS (Sierra or newer)
# For Sierra or newer, see https://github.com/mathiasbynens/dotfiles/blob/master/.macos
###

# Alot of these configs have been taken from the various places
# on the web, most from here
# https://github.com/mathiasbynens/dotfiles/blob/5b3c8418ed42d93af2e647dc9d122f25cc034871/.osx

## fix-wordpress-permissions.sh
#!/bin/bash
#
# This script configures WordPress file permissions based on recommendations
# from http://codex.wordpress.org/Hardening_WordPress#File_permissions
#
# Author: Michael Conigliaro <mike [at] conigliaro [dot] org>
#
WP_OWNER=www-data # <-- wordpress owner
WP_GROUP=www-data # <-- wordpress group
WP_ROOT=$1 # <-- wordpress root directory

## nginx.conf
# to generate your dhparam.pem file, run in the terminal
openssl dhparam -out /etc/nginx/ssl/dhparam.pem 2048

## install and add gcc arm to PATH.sh
# Download the file manually from here https://launchpad.net/gcc-arm-embedded
# Note: `curl` command doesn't work
# I downloaded this one: "gcc-arm-none-eabi-4_7-2013q3-20130916-mac.tar.bz2"

# double click it to unzip it

# Make a place to install it to
mkdir /usr/local/gcc_arm

# Move the unzipped stuff there.

## BBC-Radio.m3u
#EXTM3U
#EXTINF:-1,BBC - Radio 1
http://bbcmedia.ic.llnwd.net/stream/bbcmedia_radio1_mf_p
#EXTINF:-1,BBC - Radio 2
http://bbcmedia.ic.llnwd.net/stream/bbcmedia_radio2_mf_p
#EXTINF:-1,BBC - Radio 3
http://open.live.bbc.co.uk/mediaselector/5/select/version/2.0/mediaset/http-icy-aac-lc-a/format/pls/vpid/bbc_radio_three.pls
#EXTINF:-1,BBC - Radio 4
http://bbcmedia.ic.llnwd.net/stream/bbcmedia_radio4fm_mf_p
#EXTINF:-1,BBC - Radio 5 live

## ssl_smtp_example.go
package main

import (
    "fmt"
	  "log"
    "net"
    "net/mail"
	  "net/smtp"
    "crypto/tls"
)
	<?php

	/**
	* This is free and unencumbered software released into the public domain.
	*
	* Anyone is free to copy, modify, publish, use, compile, sell, or
	* distribute this software, either in source code form or as a compiled
	* binary, for any purpose, commercial or non-commercial, and by any
	* means.
	*
	#!/usr/bin/env ruby
	# rss-to-pdf.rb
	# Author: Werner Robitza
	# Synopsis: A basic console RSS to PDF writer using the prawn library
	# Usage: rss-to-pdf.rb <url>
	# <url> being the URL of the RSS news feed

	require 'open-uri'
	require 'nokogiri'
	require 'pp'
	<!doctype html>
	<title>Site Maintenance</title>
	<style>
	body { text-align: center; padding: 150px; }
	h1 { font-size: 50px; }
	body { font: 20px Helvetica, sans-serif; color: #333; }
	article { display: block; text-align: left; width: 650px; margin: 0 auto; }
	a { color: #dc8100; text-decoration: none; }
	a:hover { color: #333; text-decoration: none; }
	</style>
	#!/bin/sh

	###
	# SOME COMMANDS WILL NOT WORK ON macOS (Sierra or newer)
	# For Sierra or newer, see https://github.com/mathiasbynens/dotfiles/blob/master/.macos
	###

	# Alot of these configs have been taken from the various places
	# on the web, most from here
	# https://github.com/mathiasbynens/dotfiles/blob/5b3c8418ed42d93af2e647dc9d122f25cc034871/.osx
	#!/bin/bash
	#
	# This script configures WordPress file permissions based on recommendations
	# from http://codex.wordpress.org/Hardening_WordPress#File_permissions
	#
	# Author: Michael Conigliaro <mike [at] conigliaro [dot] org>
	#
	WP_OWNER=www-data # <-- wordpress owner
	WP_GROUP=www-data # <-- wordpress group
	WP_ROOT=$1 # <-- wordpress root directory
	# to generate your dhparam.pem file, run in the terminal
	openssl dhparam -out /etc/nginx/ssl/dhparam.pem 2048
	# Download the file manually from here https://launchpad.net/gcc-arm-embedded
	# Note: `curl` command doesn't work
	# I downloaded this one: "gcc-arm-none-eabi-4_7-2013q3-20130916-mac.tar.bz2"

	# double click it to unzip it

	# Make a place to install it to
	mkdir /usr/local/gcc_arm

	# Move the unzipped stuff there.
	#EXTM3U
	#EXTINF:-1,BBC - Radio 1
	http://bbcmedia.ic.llnwd.net/stream/bbcmedia_radio1_mf_p
	#EXTINF:-1,BBC - Radio 2
	http://bbcmedia.ic.llnwd.net/stream/bbcmedia_radio2_mf_p
	#EXTINF:-1,BBC - Radio 3
	http://open.live.bbc.co.uk/mediaselector/5/select/version/2.0/mediaset/http-icy-aac-lc-a/format/pls/vpid/bbc_radio_three.pls
	#EXTINF:-1,BBC - Radio 4
	http://bbcmedia.ic.llnwd.net/stream/bbcmedia_radio4fm_mf_p
	#EXTINF:-1,BBC - Radio 5 live
	package main

	import (
	"fmt"
	"log"
	"net"
	"net/mail"
	"net/smtp"
	"crypto/tls"
	)