diff options
| author | Ben Sima <ben@bsima.me> | 2023-10-10 13:31:58 -0400 |
|---|---|---|
| committer | Ben Sima <ben@bsima.me> | 2023-10-10 13:31:58 -0400 |
| commit | 83ea1cdd1fbd9c3ae7908ff1dd12363fee585b45 (patch) | |
| tree | 6377968ef1b4a41f10ce854eef1b50347405edba /Biz/Ide/hooks/post-merge.bash | |
| parent | 39481b42c19f91ee714987176937c089d2c170cb (diff) | |
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.
Diffstat (limited to 'Biz/Ide/hooks/post-merge.bash')
| -rwxr-xr-x | Biz/Ide/hooks/post-merge.bash | 4 |
1 files changed, 4 insertions, 0 deletions
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 |