Merge commit '25b02d99f68cb00a6713acbe6234383807f382ee'

industrial-curiosity · Oct 17, 2024 · 4128631 · 4128631
2 parents cf11639 + 25b02d9
commit 4128631
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -1,2 +1,3 @@
 # sandbox-repo
+
 test repo for playing around with git and github
diff --git a/add_parent.sh b/add_parent.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+# add a parent commit to the specified commit, ideal
+# for establishing the other parent of a squashed merge
+# lifted from https://stackoverflow.com/a/41243690/2860309
+
+# usage: ./add_parent.sh TARGET_COMMIT_ID NEW_PARENT_COMMIT_ID
+
+set -ex
+
+target_commit=$1
+additional_parent=$2
+
+git replace --graft $target_commit \
+    $(git show --pretty=%P $target_commit | head -n1) \
+    $additional_parent
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,3 @@
		# sandbox-repo

		test repo for playing around with git and github