From 83ea1cdd1fbd9c3ae7908ff1dd12363fee585b45 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Tue, 10 Oct 2023 13:31:58 -0400 Subject: Add git-branchless After using this for a while, I've decided that git-branchless will be the default tool for doing trunk-based development in the omnirepo. --- Biz/Ide/hooks/post-merge.bash | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Biz/Ide/hooks/post-merge.bash') diff --git a/Biz/Ide/hooks/post-merge.bash b/Biz/Ide/hooks/post-merge.bash index c21211f..94f0f60 100755 --- a/Biz/Ide/hooks/post-merge.bash +++ b/Biz/Ide/hooks/post-merge.bash @@ -1,2 +1,6 @@ #!/usr/bin/env bash exec ${CODEROOT:?}/Biz/Ide/hooks/post-checkout 'HEAD@{1}' HEAD +## START BRANCHLESS CONFIG + +git branchless hook post-merge "$@" +## END BRANCHLESS CONFIG -- cgit v1.2.3