Jakub T. Jankiewicz jcubic

How to generate and apply patches with git?

It sometimes happen you need change code on a machine from which you cannot push to the repo. You’re ready to copy/paste what diff outputs to your local working copy.

You think there must be a better way to proceed and you’re right. It’s a simple 2 steps process:

1. Generate the patch:

git diff &gt; some-changes.patch

	<?php

	/**
	* Using data from 2021 (latest) from here: https://ourworldindata.org/grapher/gdp-price-levels-relative-to-the-us?tab=table&time=latest
	*/
	class PricingParityConverter
	{
	const COUNTRY_MAP = [
	'AF' => ['name' => 'Afghanistan', 'code3' => 'AFG'],
	'AL' => ['name' => 'Albania', 'code3' => 'ALB'],

	// -----------------------------------------------------------------------------
	// Copyright (c) 2018 Jakub Jankiewicz
	// Released under MIT license
	//
	// generic namespace generator the constructor should declare private functions
	// and variables and return public api, the module is created when all dependecies
	// are resolved (all modules are created)
	//
	// @param namespace dot separated namespace that will be added to window object
	// @param dependencies array of string (dependencies) can be empty array

	#!/bin/bash

	output=$(mktemp);

	sudo certbot certonly --manual --expand --manual-public-ip-logging-ok \
	--preferred-challenges http -n \
	-d <LIST OF COMMA SEPARATED DOMAINS AND SUBDOMAINS>\
	--manual-auth-hook ./cert.py --agree-tos --email <EMAIL ADRESS> 2>&1 \| tee $output

	grep "Certificate not yet due for renewal" $output > /dev/null \|\| \

	RewriteEngine on

	RewriteCond %{SCRIPT_FILENAME} !-f
	RewriteCond %{SCRIPT_FILENAME} !-d
	RewriteRule (.*) /index.php?$1

	#!/usr/bin/env python

	import git
	import json
	import sqlite3
	import re
	import os
	import os.path

	def log(repo):

	<!DOCTYPE HTML>
	<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
	<meta charset="utf-8" />
	<title>File Explorer using jQuery UI</title>
	<script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
	<script src="http://code.jquery.com/ui/1.12.0/jquery-ui.js"></script>

	<script src="jquery.filebrowser/js/jquery.filebrowser-src.js"></script>
	<script src="json-rpc/json-rpc.js"></script>

	package com.example.package;

	import android.content.Context;

	import java.io.BufferedReader;
	import java.io.IOException;
	import java.io.InputStreamReader;
	import java.io.StringWriter;
	import java.io.PrintWriter;

	<?php

	/**
	* Generate a sequence of numbers for use in a pagination system, the clever way.
	* @author Bramus Van Damme <[email protected]>
	*
	* The algorithm always returns the same amount of items in the sequence,
	* indepdendent of the position of the current page.
	*
	* Example rows generated: