summaryrefslogtreecommitdiff
path: root/Omni/Ide
diff options
context:
space:
mode:
Diffstat (limited to 'Omni/Ide')
-rwxr-xr-xOmni/Ide/hooks/post-checkout9
-rwxr-xr-xOmni/Ide/hooks/post-merge5
-rwxr-xr-xOmni/Ide/hooks/pre-commit6
3 files changed, 0 insertions, 20 deletions
diff --git a/Omni/Ide/hooks/post-checkout b/Omni/Ide/hooks/post-checkout
index 7c8bcb9..a360517 100755
--- a/Omni/Ide/hooks/post-checkout
+++ b/Omni/Ide/hooks/post-checkout
@@ -15,15 +15,6 @@ then
MakeTags "${changed[@]}"
fi
-# Configure git merge driver for tasks
-git config merge.agent.name "Agent Merge Driver" || true
-git config merge.agent.driver "agent merge-driver %A %B" || true
-
-# Task manager: Import tasks after branch switch
-if [ -f .tasks/tasks.jsonl ]; then
- task import -i .tasks/tasks.jsonl 2>/dev/null || true
-fi
-
## START BRANCHLESS CONFIG
git branchless hook post-checkout "$@"
diff --git a/Omni/Ide/hooks/post-merge b/Omni/Ide/hooks/post-merge
index 3e0495b..bf0e996 100755
--- a/Omni/Ide/hooks/post-merge
+++ b/Omni/Ide/hooks/post-merge
@@ -1,11 +1,6 @@
#!/usr/bin/env bash
"${CODEROOT:?}"/Omni/Ide/hooks/post-checkout 'HEAD@{1}' HEAD
-# Task manager: Import tasks after git pull/merge
-if [ -f .tasks/tasks.jsonl ]; then
- task import -i .tasks/tasks.jsonl 2>/dev/null || true
-fi
-
## START BRANCHLESS CONFIG
git branchless hook post-merge "$@"
diff --git a/Omni/Ide/hooks/pre-commit b/Omni/Ide/hooks/pre-commit
index d096f5b..06f1716 100755
--- a/Omni/Ide/hooks/pre-commit
+++ b/Omni/Ide/hooks/pre-commit
@@ -18,10 +18,4 @@
fi
done
lint "${changed[@]}"
-
- # Task manager: Export tasks before commit
- if [ -d .tasks ]; then
- task export --flush 2>/dev/null || true
- git add .tasks/tasks.jsonl 2>/dev/null || true
- fi
##