Merge remote-tracking branch 'app4triqs_remote/unstable' into unstable

TRIQS · Feb 28, 2022 · 742da94 · 742da94
2 parents 4f7faeb + 125eddf
commit 742da94
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/share/squash_history.sh b/share/squash_history.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+git reset $(git commit-tree HEAD\^{tree} -m "Initialize project from github.com/triqs/app4triqs@$(git rev-parse --short HEAD)")
+git merge --allow-unrelated-histories -s ours HEAD@{1} -m "Track app4triqs skeleton"
+git remote rm origin
+git remote add app4triqs_remote https://github.com/triqs/app4triqs