Greg Korba Wirone

This gist shows how you can linearize complex Git tree that has many merge commits, making it like a "squash on merge" policy was used from the beginning of repo's history, while modifying commits' authorship in a standardised way.

It checks if a commit is a merge commit and, if so, modifies its author and parents:

merge commit becomes "regular" commit with only 1 parent
authorship for ex-merge commit is taken from the last commit of merged branch (2nd parent that is discarded). It assumes that single person was working on a branch, so it may produce false blame information if multiple people authored commits in a branch (all changes from the branch have authorship from last commit's author). In our case it was needed because merge commits are automated and authorship comes from bot user, so without

	FROM php:8.4-cli AS php-debian

	RUN apt-get -q update \
	# Pie requires ZIP extension to be installed (checked with Box requirements when executing Pie's PHAR)
	&& apt-get -yq install gnupg libzip-dev libzip4 \
	&& docker-php-ext-install zip \
	# Official docs includes one-liner that uses `latest` release, but URL gives 404.
	# Anyway, it's probably better to use fixed version of Pie to have stable builds.
	&& curl -L --output /usr/bin/pie https://github.com/php/pie/releases/download/0.2.0/pie.phar \
	&& chmod +x /usr/bin/pie \

	# See: https://quay.io/repository/strimzi/kafka
	# See: https://github.com/wurstmeister/zookeeper-docker/issues/31

	services:
	kafka:
	image: quay.io/strimzi/kafka:${KAFKA_VERSION:-0.32.0-kafka-3.3.1}
	command: [
	"sh", "-c",
	"bin/kafka-server-start.sh config/server.properties --override listeners=$${KAFKA_LISTENERS} --override advertised.listeners=$${KAFKA_ADVERTISED_LISTENERS} --override zookeeper.connect=$${KAFKA_ZOOKEEPER_CONNECT}"
	]

	Built on Docker with php:8.3.2-fpm-bullseye as a base image
	Prerequisites installed: libmagickwand-dev, libmagickwand-6.q16-6

	FYI: Same dependencies work properly on PHP 8.2.10

	-----

	326.0 downloading imagick-3.7.0.tgz ...
	326.0 Starting to download imagick-3.7.0.tgz (360,138 bytes)
	326.0 .........................................................................done: 360,138 bytes

	This is working mix of information found on the Internet.
	Most tutorials mention obsolete --write-env-file,
	so I use simple eval with whole output redirected to /dev/null
	in order to silently spawn GPG agent daemon.

	Had to use test command mentioned above so GPG asked for key's passphrase (only once).

	Got this working on:

	- Kubuntu 16.04

	// Select all results in chrome://history-frame/
	Array.prototype.slice.call(document.getElementsByTagName('input'))
	.forEach(function(inp) {
	if(inp.type != 'checkbox') { return; }

	inp.checked = true;
	});

	# GIT aliases for ~/.gitconfig file
	# @author Grzegorz Korba <[email protected]>
	# Credits: Miscellaneous places on the Internet...

	# GitFlow related sections
	[gitflow "branch"]
	master = master
	develop = develop
	[gitflow "prefix"]
	feature = feature/

	<!DOCTYPE html>
	<html>
	<head>
	<title>CasperJS - onbeforeunload issue</title>
	<meta name="author" value="Grzegorz 'Wirone' Korba" />
	<script type="text/javascript">alert('Just alerting...');</script>
	</head>
	<body>
	<h1>Page without onbeforeunload</h1>
	<a class="next" href="page_onbeforeunload.html">Next</a>