Convert gitgram/ and aitimemachine/ from embedded git repos (which showed as opaque submodule gitlinks on GitHub) into fully-tracked first-party content. AITM now merges its 7 vendored repos as first-party engines: - memory: beads (Go task DAG) + context7 (docs SDK), unified into saved_contexts - git: vendored C git (bundled binary) + gitnexus (in-process code intelligence) - agentic: a2a (@a2a-js/sdk) + pal (AITM-managed Python subprocess) Includes the full session's product build: Gitgram web/mobile/backend features, AITM website/CLI/MCP, the unified memory layer, engine build tooling (scripts/build-engines.sh, Dockerfile, CI), docs (README, ENGINES.md, ARCHITECTURE.md), and extensive test suites. Build artifacts, node_modules, external/, and gemini-cli are gitignored. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
39 lines
913 B
Plaintext
39 lines
913 B
Plaintext
diff_cmd () {
|
|
"$merge_tool_path" \
|
|
-R 'Accel.Search: "Ctrl+F"' \
|
|
-R 'Accel.SearchForward: "Ctrl+G"' \
|
|
"$LOCAL" "$REMOTE"
|
|
|
|
# xxdiff can segfault on binary files which are often uninteresting.
|
|
# Do not allow segfaults to stop us from continuing on to the next file.
|
|
if test $? = 128
|
|
then
|
|
return 1
|
|
fi
|
|
}
|
|
|
|
diff_cmd_help () {
|
|
echo "Use xxdiff (requires a graphical session)"
|
|
}
|
|
|
|
merge_cmd () {
|
|
if $base_present
|
|
then
|
|
"$merge_tool_path" -X --show-merged-pane \
|
|
-R 'Accel.SaveAsMerged: "Ctrl+S"' \
|
|
-R 'Accel.Search: "Ctrl+F"' \
|
|
-R 'Accel.SearchForward: "Ctrl+G"' \
|
|
--merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
|
|
else
|
|
"$merge_tool_path" -X $extra \
|
|
-R 'Accel.SaveAsMerged: "Ctrl+S"' \
|
|
-R 'Accel.Search: "Ctrl+F"' \
|
|
-R 'Accel.SearchForward: "Ctrl+G"' \
|
|
--merged-file "$MERGED" "$LOCAL" "$REMOTE"
|
|
fi
|
|
}
|
|
|
|
merge_cmd_help () {
|
|
echo "Use xxdiff (requires a graphical session)"
|
|
}
|