Search

Search docs and pages

Pages

Git Integration

Athas includes powerful Git integration.

Features

  • Source Control Panel: View changed files, stage, and commit
  • Branch Management: Create, switch, and merge branches
  • Worktree Management: Open separate checkouts as current-window or new-window workspaces
  • Commit History: Browse commit log with diffs
  • Inline Blame: See who changed each line
  • Diff Viewer: Side-by-side and inline diff views
  • Stash Management: Save and restore work in progress

Getting Started

  1. Open a folder that is a Git repository
  2. Click the Git icon in the sidebar
  3. View changed files, stage changes, and commit

Source Control Panel

  • Staged Changes: Files ready to commit
  • Changes: Modified files not yet staged
  • Untracked: New files not tracked by Git

Click the + icon to stage files, or use the checkmark to commit.

GitHub account features are separate from local Git operations. See GitHub Integration for dashboard sync, account access, and token storage details.

Use Worktrees when you want multiple branches checked out at the same time with separate workspace, terminal, and Git status state.

Keyboard Shortcuts

  • Cmd/Ctrl+Shift+G: Open Source Control panel
  • Cmd/Ctrl+Enter: Commit staged changes