diff --git a/src-tauri/src/git.rs b/src-tauri/src/git.rs
new file mode 100644
index 0000000..96ea1a4
--- /dev/null
+++ b/src-tauri/src/git.rs
@@ -0,0 +1,288 @@
+use serde::{Deserialize, Serialize};
+use std::process::Command;
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct GitStatus {
+    pub is_repo: bool,
+    pub branch: Option<String>,
+    pub upstream: Option<String>,
+    pub ahead: u32,
+    pub behind: u32,
+    pub staged: Vec<GitFileChange>,
+    pub unstaged: Vec<GitFileChange>,
+    pub untracked: Vec<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct GitFileChange {
+    pub path: String,
+    pub status: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct GitBranch {
+    pub name: String,
+    pub is_current: bool,
+    pub is_remote: bool,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct GitLogEntry {
+    pub hash: String,
+    pub short_hash: String,
+    pub author: String,
+    pub date: String,
+    pub message: String,
+}
+
+fn run_git_command(working_dir: &str, args: &[&str]) -> Result<String, String> {
+    let output = Command::new("git")
+        .args(args)
+        .current_dir(working_dir)
+        .output()
+        .map_err(|e| format!("Failed to execute git: {}", e))?;
+
+    if output.status.success() {
+        Ok(String::from_utf8_lossy(&output.stdout).to_string())
+    } else {
+        Err(String::from_utf8_lossy(&output.stderr).to_string())
+    }
+}
+
+#[tauri::command]
+pub fn git_status(working_dir: String) -> Result<GitStatus, String> {
+    // Check if it's a git repo
+    let is_repo = run_git_command(&working_dir, &["rev-parse", "--git-dir"]).is_ok();
+
+    if !is_repo {
+        return Ok(GitStatus {
+            is_repo: false,
+            branch: None,
+            upstream: None,
+            ahead: 0,
+            behind: 0,
+            staged: vec![],
+            unstaged: vec![],
+            untracked: vec![],
+        });
+    }
+
+    // Get current branch
+    let branch = run_git_command(&working_dir, &["rev-parse", "--abbrev-ref", "HEAD"])
+        .ok()
+        .map(|s| s.trim().to_string());
+
+    // Get upstream branch
+    let upstream = run_git_command(
+        &working_dir,
+        &["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"],
+    )
+    .ok()
+    .map(|s| s.trim().to_string());
+
+    // Get ahead/behind counts
+    let (ahead, behind) = if upstream.is_some() {
+        let rev_list =
+            run_git_command(&working_dir, &["rev-list", "--left-right", "--count", "@{u}...HEAD"])
+                .unwrap_or_default();
+        let parts: Vec<&str> = rev_list.trim().split('\t').collect();
+        if parts.len() == 2 {
+            (
+                parts[1].parse().unwrap_or(0),
+                parts[0].parse().unwrap_or(0),
+            )
+        } else {
+            (0, 0)
+        }
+    } else {
+        (0, 0)
+    };
+
+    // Get status with porcelain format
+    let status_output =
+        run_git_command(&working_dir, &["status", "--porcelain=v1"]).unwrap_or_default();
+
+    let mut staged = vec![];
+    let mut unstaged = vec![];
+    let mut untracked = vec![];
+
+    for line in status_output.lines() {
+        if line.len() < 3 {
+            continue;
+        }
+
+        let index_status = line.chars().next().unwrap_or(' ');
+        let worktree_status = line.chars().nth(1).unwrap_or(' ');
+        let path = line[3..].to_string();
+
+        // Untracked files
+        if index_status == '?' && worktree_status == '?' {
+            untracked.push(path);
+            continue;
+        }
+
+        // Staged changes (index status)
+        if index_status != ' ' && index_status != '?' {
+            staged.push(GitFileChange {
+                path: path.clone(),
+                status: match index_status {
+                    'M' => "modified".to_string(),
+                    'A' => "added".to_string(),
+                    'D' => "deleted".to_string(),
+                    'R' => "renamed".to_string(),
+                    'C' => "copied".to_string(),
+                    _ => "unknown".to_string(),
+                },
+            });
+        }
+
+        // Unstaged changes (worktree status)
+        if worktree_status != ' ' && worktree_status != '?' {
+            unstaged.push(GitFileChange {
+                path,
+                status: match worktree_status {
+                    'M' => "modified".to_string(),
+                    'D' => "deleted".to_string(),
+                    _ => "unknown".to_string(),
+                },
+            });
+        }
+    }
+
+    Ok(GitStatus {
+        is_repo: true,
+        branch,
+        upstream,
+        ahead,
+        behind,
+        staged,
+        unstaged,
+        untracked,
+    })
+}
+
+#[tauri::command]
+pub fn git_diff(working_dir: String, file_path: Option<String>, staged: bool) -> Result<String, String> {
+    let mut args = vec!["diff"];
+
+    if staged {
+        args.push("--cached");
+    }
+
+    if let Some(ref path) = file_path {
+        args.push("--");
+        args.push(path);
+    }
+
+    run_git_command(&working_dir, &args)
+}
+
+#[tauri::command]
+pub fn git_branches(working_dir: String) -> Result<Vec<GitBranch>, String> {
+    let output = run_git_command(&working_dir, &["branch", "-a", "--format=%(refname:short)\t%(HEAD)"])?;
+
+    let branches: Vec<GitBranch> = output
+        .lines()
+        .filter_map(|line| {
+            let parts: Vec<&str> = line.split('\t').collect();
+            if parts.is_empty() {
+                return None;
+            }
+
+            let name = parts[0].to_string();
+            let is_current = parts.get(1).map(|s| *s == "*").unwrap_or(false);
+            let is_remote = name.starts_with("remotes/") || name.starts_with("origin/");
+
+            Some(GitBranch {
+                name,
+                is_current,
+                is_remote,
+            })
+        })
+        .collect();
+
+    Ok(branches)
+}
+
+#[tauri::command]
+pub fn git_checkout(working_dir: String, branch: String) -> Result<String, String> {
+    run_git_command(&working_dir, &["checkout", &branch])
+}
+
+#[tauri::command]
+pub fn git_stage(working_dir: String, file_path: String) -> Result<String, String> {
+    run_git_command(&working_dir, &["add", &file_path])
+}
+
+#[tauri::command]
+pub fn git_unstage(working_dir: String, file_path: String) -> Result<String, String> {
+    run_git_command(&working_dir, &["restore", "--staged", &file_path])
+}
+
+#[tauri::command]
+pub fn git_stage_all(working_dir: String) -> Result<String, String> {
+    run_git_command(&working_dir, &["add", "-A"])
+}
+
+#[tauri::command]
+pub fn git_commit(working_dir: String, message: String) -> Result<String, String> {
+    run_git_command(&working_dir, &["commit", "-m", &message])
+}
+
+#[tauri::command]
+pub fn git_push(working_dir: String) -> Result<String, String> {
+    run_git_command(&working_dir, &["push"])
+}
+
+#[tauri::command]
+pub fn git_pull(working_dir: String) -> Result<String, String> {
+    run_git_command(&working_dir, &["pull"])
+}
+
+#[tauri::command]
+pub fn git_fetch(working_dir: String) -> Result<String, String> {
+    run_git_command(&working_dir, &["fetch", "--all"])
+}
+
+#[tauri::command]
+pub fn git_log(working_dir: String, limit: Option<u32>) -> Result<Vec<GitLogEntry>, String> {
+    let limit_str = limit.unwrap_or(10).to_string();
+    let output = run_git_command(
+        &working_dir,
+        &[
+            "log",
+            &format!("-{}", limit_str),
+            "--pretty=format:%H\t%h\t%an\t%ar\t%s",
+        ],
+    )?;
+
+    let entries: Vec<GitLogEntry> = output
+        .lines()
+        .filter_map(|line| {
+            let parts: Vec<&str> = line.split('\t').collect();
+            if parts.len() < 5 {
+                return None;
+            }
+
+            Some(GitLogEntry {
+                hash: parts[0].to_string(),
+                short_hash: parts[1].to_string(),
+                author: parts[2].to_string(),
+                date: parts[3].to_string(),
+                message: parts[4..].join("\t"),
+            })
+        })
+        .collect();
+
+    Ok(entries)
+}
+
+#[tauri::command]
+pub fn git_discard(working_dir: String, file_path: String) -> Result<String, String> {
+    run_git_command(&working_dir, &["checkout", "--", &file_path])
+}
+
+#[tauri::command]
+pub fn git_create_branch(working_dir: String, branch_name: String) -> Result<String, String> {
+    run_git_command(&working_dir, &["checkout", "-b", &branch_name])
+}
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 96966e1..16ab2df 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -2,6 +2,7 @@ mod achievements;
 mod bridge_manager;
 mod commands;
 mod config;
+mod git;
 mod notifications;
 mod sessions;
 mod snippets;
@@ -17,6 +18,7 @@ mod wsl_notifications;
 use bridge_manager::create_shared_bridge_manager;
 use commands::load_saved_achievements;
 use commands::*;
+use git::*;
 use notifications::*;
 use sessions::*;
 use snippets::*;
@@ -118,6 +120,20 @@ pub fn run() {
             delete_snippet,
             get_snippet_categories,
             reset_default_snippets,
+            git_status,
+            git_diff,
+            git_branches,
+            git_checkout,
+            git_stage,
+            git_unstage,
+            git_stage_all,
+            git_commit,
+            git_push,
+            git_pull,
+            git_fetch,
+            git_log,
+            git_discard,
+            git_create_branch,
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
diff --git a/src/lib/components/GitPanel.svelte b/src/lib/components/GitPanel.svelte
new file mode 100644
index 0000000..adf4377
--- /dev/null
+++ b/src/lib/components/GitPanel.svelte
@@ -0,0 +1,1123 @@
+<script lang="ts">
+  import { invoke } from "@tauri-apps/api/core";
+  import { onMount, onDestroy } from "svelte";
+  import { claudeStore } from "$lib/stores/claude";
+
+  interface GitFileChange {
+    path: string;
+    status: string;
+  }
+
+  interface GitStatus {
+    is_repo: boolean;
+    branch: string | null;
+    upstream: string | null;
+    ahead: number;
+    behind: number;
+    staged: GitFileChange[];
+    unstaged: GitFileChange[];
+    untracked: string[];
+  }
+
+  interface GitBranch {
+    name: string;
+    is_current: boolean;
+    is_remote: boolean;
+  }
+
+  interface GitLogEntry {
+    hash: string;
+    short_hash: string;
+    author: string;
+    date: string;
+    message: string;
+  }
+
+  export let isOpen = false;
+  export let onClose: () => void;
+
+  let status: GitStatus | null = null;
+  let branches: GitBranch[] = [];
+  let log: GitLogEntry[] = [];
+  let loading = false;
+  let error: string | null = null;
+  let activeTab: "changes" | "branches" | "history" = "changes";
+  let commitMessage = "";
+  let showDiff = false;
+  let diffContent = "";
+  let diffFile: string | null = null;
+  let showBranchInput = false;
+  let newBranchName = "";
+  let actionInProgress = false;
+  let workingDir = "";
+
+  let refreshInterval: ReturnType<typeof setInterval> | null = null;
+
+  claudeStore.currentWorkingDirectory.subscribe((dir) => {
+    workingDir = dir;
+  });
+
+  onMount(() => {
+    if (isOpen) {
+      refresh();
+      refreshInterval = setInterval(refresh, 5000);
+    }
+  });
+
+  onDestroy(() => {
+    if (refreshInterval) {
+      clearInterval(refreshInterval);
+    }
+  });
+
+  $: if (isOpen && !refreshInterval) {
+    refresh();
+    refreshInterval = setInterval(refresh, 5000);
+  } else if (!isOpen && refreshInterval) {
+    clearInterval(refreshInterval);
+    refreshInterval = null;
+  }
+
+  async function refresh() {
+    if (!workingDir) return;
+
+    loading = true;
+    error = null;
+
+    try {
+      status = await invoke<GitStatus>("git_status", { workingDir: workingDir });
+
+      if (status.is_repo) {
+        branches = await invoke<GitBranch[]>("git_branches", { workingDir: workingDir });
+        log = await invoke<GitLogEntry[]>("git_log", {
+          workingDir: workingDir,
+          limit: 20,
+        });
+      }
+    } catch (e) {
+      error = e as string;
+    } finally {
+      loading = false;
+    }
+  }
+
+  async function viewDiff(filePath: string, staged: boolean) {
+    try {
+      diffContent = await invoke<string>("git_diff", {
+        workingDir: workingDir,
+        filePath,
+        staged,
+      });
+      diffFile = filePath;
+      showDiff = true;
+    } catch (e) {
+      error = e as string;
+    }
+  }
+
+  async function stageFile(filePath: string) {
+    actionInProgress = true;
+    try {
+      await invoke("git_stage", { workingDir: workingDir, filePath });
+      await refresh();
+    } catch (e) {
+      error = e as string;
+    } finally {
+      actionInProgress = false;
+    }
+  }
+
+  async function unstageFile(filePath: string) {
+    actionInProgress = true;
+    try {
+      await invoke("git_unstage", { workingDir: workingDir, filePath });
+      await refresh();
+    } catch (e) {
+      error = e as string;
+    } finally {
+      actionInProgress = false;
+    }
+  }
+
+  async function stageAll() {
+    actionInProgress = true;
+    try {
+      await invoke("git_stage_all", { workingDir: workingDir });
+      await refresh();
+    } catch (e) {
+      error = e as string;
+    } finally {
+      actionInProgress = false;
+    }
+  }
+
+  async function discardFile(filePath: string) {
+    if (!confirm(`Discard changes to ${filePath}? This cannot be undone.`)) return;
+
+    actionInProgress = true;
+    try {
+      await invoke("git_discard", { workingDir: workingDir, filePath });
+      await refresh();
+    } catch (e) {
+      error = e as string;
+    } finally {
+      actionInProgress = false;
+    }
+  }
+
+  async function commit() {
+    if (!commitMessage.trim()) {
+      error = "Please enter a commit message";
+      return;
+    }
+
+    actionInProgress = true;
+    try {
+      await invoke("git_commit", { workingDir: workingDir, message: commitMessage });
+      commitMessage = "";
+      await refresh();
+    } catch (e) {
+      error = e as string;
+    } finally {
+      actionInProgress = false;
+    }
+  }
+
+  async function push() {
+    actionInProgress = true;
+    try {
+      await invoke("git_push", { workingDir: workingDir });
+      await refresh();
+    } catch (e) {
+      error = e as string;
+    } finally {
+      actionInProgress = false;
+    }
+  }
+
+  async function pull() {
+    actionInProgress = true;
+    try {
+      await invoke("git_pull", { workingDir: workingDir });
+      await refresh();
+    } catch (e) {
+      error = e as string;
+    } finally {
+      actionInProgress = false;
+    }
+  }
+
+  async function fetch() {
+    actionInProgress = true;
+    try {
+      await invoke("git_fetch", { workingDir: workingDir });
+      await refresh();
+    } catch (e) {
+      error = e as string;
+    } finally {
+      actionInProgress = false;
+    }
+  }
+
+  async function checkout(branch: string) {
+    actionInProgress = true;
+    try {
+      await invoke("git_checkout", { workingDir: workingDir, branch });
+      await refresh();
+    } catch (e) {
+      error = e as string;
+    } finally {
+      actionInProgress = false;
+    }
+  }
+
+  async function createBranch() {
+    if (!newBranchName.trim()) return;
+
+    actionInProgress = true;
+    try {
+      await invoke("git_create_branch", {
+        workingDir: workingDir,
+        branchName: newBranchName,
+      });
+      newBranchName = "";
+      showBranchInput = false;
+      await refresh();
+    } catch (e) {
+      error = e as string;
+    } finally {
+      actionInProgress = false;
+    }
+  }
+
+  function getStatusIcon(status: string): string {
+    switch (status) {
+      case "modified":
+        return "✏️";
+      case "added":
+        return "➕";
+      case "deleted":
+        return "🗑️";
+      case "renamed":
+        return "📝";
+      default:
+        return "❓";
+    }
+  }
+
+  function handleKeydown(event: KeyboardEvent) {
+    if (event.key === "Escape") {
+      if (showDiff) {
+        showDiff = false;
+      } else {
+        onClose();
+      }
+    }
+  }
+</script>
+
+<svelte:window on:keydown={handleKeydown} />
+
+{#if isOpen}
+  <div class="git-panel-overlay" on:click={onClose} role="presentation">
+    <div class="git-panel" on:click|stopPropagation role="dialog" aria-label="Git Panel">
+      <div class="git-panel-header">
+        <h2>🔀 Git</h2>
+        <button class="close-btn" on:click={onClose} title="Close (Esc)">✕</button>
+      </div>
+
+      {#if !workingDir}
+        <div class="git-panel-content">
+          <p class="empty-state">No working directory selected</p>
+        </div>
+      {:else if loading && !status}
+        <div class="git-panel-content">
+          <p class="loading">Loading git status...</p>
+        </div>
+      {:else if !status?.is_repo}
+        <div class="git-panel-content">
+          <p class="empty-state">Not a git repository</p>
+        </div>
+      {:else}
+        <div class="git-info-bar">
+          <div class="branch-info">
+            <span class="branch-icon">🌿</span>
+            <span class="branch-name">{status.branch || "detached"}</span>
+            {#if status.upstream}
+              <span class="upstream">→ {status.upstream}</span>
+            {/if}
+          </div>
+          <div class="sync-status">
+            {#if status.ahead > 0}
+              <span class="ahead" title="Commits ahead">↑{status.ahead}</span>
+            {/if}
+            {#if status.behind > 0}
+              <span class="behind" title="Commits behind">↓{status.behind}</span>
+            {/if}
+          </div>
+          <div class="quick-actions">
+            <button
+              on:click={fetch}
+              disabled={actionInProgress}
+              title="Fetch all remotes"
+              class="icon-btn"
+            >
+              🔄
+            </button>
+            <button on:click={pull} disabled={actionInProgress} title="Pull" class="icon-btn">
+              ⬇️
+            </button>
+            <button
+              on:click={push}
+              disabled={actionInProgress || status.ahead === 0}
+              title="Push"
+              class="icon-btn"
+            >
+              ⬆️
+            </button>
+          </div>
+        </div>
+
+        {#if error}
+          <div class="error-banner">
+            <span>{error}</span>
+            <button on:click={() => (error = null)}>✕</button>
+          </div>
+        {/if}
+
+        <div class="tab-bar">
+          <button
+            class="tab"
+            class:active={activeTab === "changes"}
+            on:click={() => (activeTab = "changes")}
+          >
+            Changes
+            {#if status.staged.length + status.unstaged.length + status.untracked.length > 0}
+              <span class="badge"
+                >{status.staged.length + status.unstaged.length + status.untracked.length}</span
+              >
+            {/if}
+          </button>
+          <button
+            class="tab"
+            class:active={activeTab === "branches"}
+            on:click={() => (activeTab = "branches")}
+          >
+            Branches
+          </button>
+          <button
+            class="tab"
+            class:active={activeTab === "history"}
+            on:click={() => (activeTab = "history")}
+          >
+            History
+          </button>
+        </div>
+
+        <div class="git-panel-content">
+          {#if activeTab === "changes"}
+            {#if status.staged.length > 0}
+              <div class="file-section">
+                <h3>Staged Changes ({status.staged.length})</h3>
+                <div class="file-list">
+                  {#each status.staged as file (file.path)}
+                    <div class="file-item staged">
+                      <span class="status-icon">{getStatusIcon(file.status)}</span>
+                      <span class="file-path" title={file.path}>{file.path}</span>
+                      <div class="file-actions">
+                        <button
+                          on:click={() => viewDiff(file.path, true)}
+                          title="View diff"
+                          class="icon-btn small"
+                        >
+                          👁️
+                        </button>
+                        <button
+                          on:click={() => unstageFile(file.path)}
+                          disabled={actionInProgress}
+                          title="Unstage"
+                          class="icon-btn small"
+                        >
+                          ➖
+                        </button>
+                      </div>
+                    </div>
+                  {/each}
+                </div>
+              </div>
+            {/if}
+
+            {#if status.unstaged.length > 0}
+              <div class="file-section">
+                <h3>
+                  Unstaged Changes ({status.unstaged.length})
+                  <button
+                    on:click={stageAll}
+                    disabled={actionInProgress}
+                    class="stage-all-btn"
+                    title="Stage all"
+                  >
+                    Stage All
+                  </button>
+                </h3>
+                <div class="file-list">
+                  {#each status.unstaged as file (file.path)}
+                    <div class="file-item unstaged">
+                      <span class="status-icon">{getStatusIcon(file.status)}</span>
+                      <span class="file-path" title={file.path}>{file.path}</span>
+                      <div class="file-actions">
+                        <button
+                          on:click={() => viewDiff(file.path, false)}
+                          title="View diff"
+                          class="icon-btn small"
+                        >
+                          👁️
+                        </button>
+                        <button
+                          on:click={() => stageFile(file.path)}
+                          disabled={actionInProgress}
+                          title="Stage"
+                          class="icon-btn small"
+                        >
+                          ➕
+                        </button>
+                        <button
+                          on:click={() => discardFile(file.path)}
+                          disabled={actionInProgress}
+                          title="Discard changes"
+                          class="icon-btn small danger"
+                        >
+                          🗑️
+                        </button>
+                      </div>
+                    </div>
+                  {/each}
+                </div>
+              </div>
+            {/if}
+
+            {#if status.untracked.length > 0}
+              <div class="file-section">
+                <h3>Untracked Files ({status.untracked.length})</h3>
+                <div class="file-list">
+                  {#each status.untracked as file (file)}
+                    <div class="file-item untracked">
+                      <span class="status-icon">❓</span>
+                      <span class="file-path" title={file}>{file}</span>
+                      <div class="file-actions">
+                        <button
+                          on:click={() => stageFile(file)}
+                          disabled={actionInProgress}
+                          title="Stage"
+                          class="icon-btn small"
+                        >
+                          ➕
+                        </button>
+                      </div>
+                    </div>
+                  {/each}
+                </div>
+              </div>
+            {/if}
+
+            {#if status.staged.length === 0 && status.unstaged.length === 0 && status.untracked.length === 0}
+              <p class="empty-state">✨ Working tree clean</p>
+            {/if}
+
+            {#if status.staged.length > 0}
+              <div class="commit-section">
+                <textarea
+                  bind:value={commitMessage}
+                  placeholder="Commit message..."
+                  rows="3"
+                  disabled={actionInProgress}
+                ></textarea>
+                <button
+                  on:click={commit}
+                  disabled={actionInProgress || !commitMessage.trim()}
+                  class="commit-btn"
+                >
+                  Commit
+                </button>
+              </div>
+            {/if}
+          {:else if activeTab === "branches"}
+            <div class="branch-section">
+              <div class="branch-actions">
+                {#if showBranchInput}
+                  <div class="new-branch-input">
+                    <input
+                      type="text"
+                      bind:value={newBranchName}
+                      placeholder="New branch name..."
+                      on:keydown={(e) => e.key === "Enter" && createBranch()}
+                    />
+                    <button on:click={createBranch} disabled={actionInProgress}>Create</button>
+                    <button on:click={() => (showBranchInput = false)}>Cancel</button>
+                  </div>
+                {:else}
+                  <button on:click={() => (showBranchInput = true)} class="new-branch-btn">
+                    ➕ New Branch
+                  </button>
+                {/if}
+              </div>
+
+              <h3>Local Branches</h3>
+              <div class="branch-list">
+                {#each branches.filter((b) => !b.is_remote) as branch (branch.name)}
+                  <div class="branch-item" class:current={branch.is_current}>
+                    <span class="branch-icon">{branch.is_current ? "✓" : "○"}</span>
+                    <span class="branch-name">{branch.name}</span>
+                    {#if !branch.is_current}
+                      <button
+                        on:click={() => checkout(branch.name)}
+                        disabled={actionInProgress}
+                        class="checkout-btn"
+                      >
+                        Checkout
+                      </button>
+                    {/if}
+                  </div>
+                {/each}
+              </div>
+
+              {#if branches.filter((b) => b.is_remote).length > 0}
+                <h3>Remote Branches</h3>
+                <div class="branch-list">
+                  {#each branches.filter((b) => b.is_remote) as branch (branch.name)}
+                    <div class="branch-item remote">
+                      <span class="branch-icon">☁️</span>
+                      <span class="branch-name">{branch.name}</span>
+                    </div>
+                  {/each}
+                </div>
+              {/if}
+            </div>
+          {:else if activeTab === "history"}
+            <div class="history-list">
+              {#each log as entry (entry.hash)}
+                <div class="log-entry">
+                  <div class="log-header">
+                    <span class="commit-hash" title={entry.hash}>{entry.short_hash}</span>
+                    <span class="commit-date">{entry.date}</span>
+                  </div>
+                  <div class="commit-message">{entry.message}</div>
+                  <div class="commit-author">by {entry.author}</div>
+                </div>
+              {/each}
+            </div>
+          {/if}
+        </div>
+      {/if}
+    </div>
+  </div>
+
+  {#if showDiff}
+    <div class="diff-overlay" on:click={() => (showDiff = false)} role="presentation">
+      <div class="diff-modal" on:click|stopPropagation role="dialog" aria-label="Diff View">
+        <div class="diff-header">
+          <h3>📄 {diffFile}</h3>
+          <button on:click={() => (showDiff = false)} title="Close">✕</button>
+        </div>
+        <pre class="diff-content">{diffContent || "(No changes)"}</pre>
+      </div>
+    </div>
+  {/if}
+{/if}
+
+<style>
+  .git-panel-overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.5);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 1000;
+  }
+
+  .git-panel {
+    background: var(--bg-secondary);
+    border: 1px solid var(--border-color);
+    border-radius: 8px;
+    width: 600px;
+    max-width: 90vw;
+    max-height: 80vh;
+    display: flex;
+    flex-direction: column;
+    box-shadow: 0 4px 20px rgba(0, 0, 0, 0.3);
+  }
+
+  .git-panel-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 1rem;
+    border-bottom: 1px solid var(--border-color);
+  }
+
+  .git-panel-header h2 {
+    margin: 0;
+    font-size: 1.2rem;
+  }
+
+  .close-btn {
+    background: none;
+    border: none;
+    color: var(--text-primary);
+    cursor: pointer;
+    font-size: 1.2rem;
+    padding: 0.25rem 0.5rem;
+    border-radius: 4px;
+  }
+
+  .close-btn:hover {
+    background: var(--bg-tertiary);
+  }
+
+  .git-info-bar {
+    display: flex;
+    align-items: center;
+    gap: 1rem;
+    padding: 0.75rem 1rem;
+    background: var(--bg-tertiary);
+    border-bottom: 1px solid var(--border-color);
+  }
+
+  .branch-info {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    flex: 1;
+    min-width: 0;
+    overflow: hidden;
+  }
+
+  .branch-icon {
+    font-size: 1rem;
+  }
+
+  .branch-name {
+    font-weight: 600;
+    color: var(--accent-primary);
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .upstream {
+    color: var(--text-secondary);
+    font-size: 0.85rem;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .sync-status {
+    display: flex;
+    gap: 0.5rem;
+    flex-shrink: 0;
+  }
+
+  .ahead,
+  .behind {
+    font-size: 0.85rem;
+    padding: 0.1rem 0.4rem;
+    border-radius: 4px;
+  }
+
+  .ahead {
+    background: var(--success-color);
+    color: white;
+  }
+
+  .behind {
+    background: var(--warning-color);
+    color: white;
+  }
+
+  .quick-actions {
+    display: flex;
+    gap: 0.25rem;
+    flex-shrink: 0;
+  }
+
+  .icon-btn {
+    background: none;
+    border: none;
+    cursor: pointer;
+    padding: 0.25rem 0.5rem;
+    border-radius: 4px;
+    font-size: 1rem;
+  }
+
+  .icon-btn:hover:not(:disabled) {
+    background: var(--bg-secondary);
+  }
+
+  .icon-btn:disabled {
+    opacity: 0.5;
+    cursor: not-allowed;
+  }
+
+  .icon-btn.small {
+    font-size: 0.85rem;
+    padding: 0.15rem 0.35rem;
+  }
+
+  .icon-btn.danger:hover:not(:disabled) {
+    background: rgba(255, 0, 0, 0.2);
+  }
+
+  .error-banner {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0.5rem 1rem;
+    background: rgba(255, 0, 0, 0.1);
+    border-bottom: 1px solid var(--error-color);
+    color: var(--error-color);
+  }
+
+  .error-banner button {
+    background: none;
+    border: none;
+    color: var(--error-color);
+    cursor: pointer;
+  }
+
+  .tab-bar {
+    display: flex;
+    border-bottom: 1px solid var(--border-color);
+  }
+
+  .tab {
+    flex: 1;
+    padding: 0.75rem;
+    background: none;
+    border: none;
+    color: var(--text-secondary);
+    cursor: pointer;
+    border-bottom: 2px solid transparent;
+    transition: all 0.2s;
+  }
+
+  .tab:hover {
+    background: var(--bg-tertiary);
+  }
+
+  .tab.active {
+    color: var(--accent-primary);
+    border-bottom-color: var(--accent-primary);
+  }
+
+  .badge {
+    background: var(--accent-primary);
+    color: white;
+    font-size: 0.75rem;
+    padding: 0.1rem 0.4rem;
+    border-radius: 10px;
+    margin-left: 0.25rem;
+  }
+
+  .git-panel-content {
+    flex: 1;
+    overflow-y: auto;
+    padding: 1rem;
+  }
+
+  .empty-state,
+  .loading {
+    text-align: center;
+    color: var(--text-secondary);
+    padding: 2rem;
+  }
+
+  .file-section {
+    margin-bottom: 1.5rem;
+  }
+
+  .file-section h3 {
+    font-size: 0.9rem;
+    color: var(--text-secondary);
+    margin: 0 0 0.5rem 0;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .stage-all-btn {
+    font-size: 0.75rem;
+    padding: 0.2rem 0.5rem;
+    background: var(--accent-primary);
+    color: white;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+    transition: background 0.2s;
+  }
+
+  .stage-all-btn:hover:not(:disabled) {
+    background: var(--accent-secondary);
+  }
+
+  .file-list {
+    display: flex;
+    flex-direction: column;
+    gap: 0.25rem;
+  }
+
+  .file-item {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    padding: 0.4rem 0.5rem;
+    background: var(--bg-tertiary);
+    border-radius: 4px;
+    font-size: 0.85rem;
+  }
+
+  .file-item.staged {
+    border-left: 3px solid var(--success-color);
+  }
+
+  .file-item.unstaged {
+    border-left: 3px solid var(--warning-color);
+  }
+
+  .file-item.untracked {
+    border-left: 3px solid var(--text-secondary);
+  }
+
+  .status-icon {
+    font-size: 0.8rem;
+  }
+
+  .file-path {
+    flex: 1;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    font-family: var(--font-mono);
+  }
+
+  .file-actions {
+    display: flex;
+    gap: 0.25rem;
+    opacity: 0;
+    transition: opacity 0.2s;
+  }
+
+  .file-item:hover .file-actions {
+    opacity: 1;
+  }
+
+  .commit-section {
+    margin-top: 1rem;
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
+  }
+
+  .commit-section textarea {
+    background: var(--bg-tertiary);
+    border: 1px solid var(--border-color);
+    border-radius: 4px;
+    padding: 0.5rem;
+    color: var(--text-primary);
+    font-family: inherit;
+    resize: vertical;
+  }
+
+  .commit-btn {
+    background: var(--accent-primary);
+    color: white;
+    border: none;
+    padding: 0.5rem 1rem;
+    border-radius: 8px;
+    cursor: pointer;
+    font-weight: 600;
+    transition: all 0.2s;
+  }
+
+  .commit-btn:hover:not(:disabled) {
+    background: var(--accent-secondary);
+    transform: scale(1.02);
+  }
+
+  .commit-btn:disabled {
+    opacity: 0.5;
+    cursor: not-allowed;
+  }
+
+  .branch-section h3 {
+    font-size: 0.9rem;
+    color: var(--text-secondary);
+    margin: 1rem 0 0.5rem 0;
+  }
+
+  .branch-actions {
+    margin-bottom: 1rem;
+  }
+
+  .new-branch-btn {
+    background: var(--accent-primary);
+    color: white;
+    border: none;
+    padding: 0.5rem 1rem;
+    border-radius: 8px;
+    cursor: pointer;
+    transition: background 0.2s;
+  }
+
+  .new-branch-btn:hover {
+    background: var(--accent-secondary);
+  }
+
+  .new-branch-input {
+    display: flex;
+    gap: 0.5rem;
+  }
+
+  .new-branch-input input {
+    flex: 1;
+    background: var(--bg-tertiary);
+    border: 1px solid var(--border-color);
+    border-radius: 4px;
+    padding: 0.5rem;
+    color: var(--text-primary);
+  }
+
+  .new-branch-input button {
+    padding: 0.5rem 1rem;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+  }
+
+  .new-branch-input button:first-of-type {
+    background: var(--accent-primary);
+    color: white;
+    transition: background 0.2s;
+  }
+
+  .new-branch-input button:first-of-type:hover:not(:disabled) {
+    background: var(--accent-secondary);
+  }
+
+  .new-branch-input button:last-of-type {
+    background: var(--bg-tertiary);
+    color: var(--text-primary);
+  }
+
+  .branch-list {
+    display: flex;
+    flex-direction: column;
+    gap: 0.25rem;
+  }
+
+  .branch-item {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    padding: 0.5rem;
+    background: var(--bg-tertiary);
+    border-radius: 4px;
+  }
+
+  .branch-item.current {
+    background: color-mix(in srgb, var(--accent-primary) 10%, transparent);
+    border-left: 3px solid var(--accent-primary);
+  }
+
+  .branch-item.remote {
+    opacity: 0.7;
+  }
+
+  .branch-item .branch-name {
+    flex: 1;
+    font-family: var(--font-mono);
+    font-size: 0.9rem;
+    color: var(--text-primary);
+    font-weight: normal;
+  }
+
+  .checkout-btn {
+    font-size: 0.75rem;
+    padding: 0.2rem 0.5rem;
+    background: var(--bg-secondary);
+    color: var(--text-primary);
+    border: 1px solid var(--border-color);
+    border-radius: 4px;
+    cursor: pointer;
+    opacity: 0;
+    transition: opacity 0.2s;
+  }
+
+  .branch-item:hover .checkout-btn {
+    opacity: 1;
+  }
+
+  .history-list {
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
+  }
+
+  .log-entry {
+    padding: 0.75rem;
+    background: var(--bg-tertiary);
+    border-radius: 4px;
+    border-left: 3px solid var(--accent-primary);
+  }
+
+  .log-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 0.25rem;
+  }
+
+  .commit-hash {
+    font-family: var(--font-mono);
+    font-size: 0.8rem;
+    color: var(--accent-primary);
+    cursor: pointer;
+  }
+
+  .commit-date {
+    font-size: 0.75rem;
+    color: var(--text-secondary);
+  }
+
+  .commit-message {
+    font-size: 0.9rem;
+    margin-bottom: 0.25rem;
+  }
+
+  .commit-author {
+    font-size: 0.75rem;
+    color: var(--text-secondary);
+  }
+
+  .diff-overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.7);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 1100;
+  }
+
+  .diff-modal {
+    background: var(--bg-secondary);
+    border: 1px solid var(--border-color);
+    border-radius: 8px;
+    width: 800px;
+    max-width: 95vw;
+    max-height: 80vh;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .diff-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0.75rem 1rem;
+    border-bottom: 1px solid var(--border-color);
+  }
+
+  .diff-header h3 {
+    margin: 0;
+    font-size: 1rem;
+    font-family: var(--font-mono);
+  }
+
+  .diff-header button {
+    background: none;
+    border: none;
+    color: var(--text-primary);
+    cursor: pointer;
+    font-size: 1.2rem;
+  }
+
+  .diff-content {
+    flex: 1;
+    overflow: auto;
+    padding: 1rem;
+    margin: 0;
+    font-family: var(--font-mono);
+    font-size: 0.85rem;
+    line-height: 1.4;
+    white-space: pre;
+    background: var(--bg-primary);
+  }
+</style>
diff --git a/src/lib/components/StatusBar.svelte b/src/lib/components/StatusBar.svelte
index 543f674..533d6d8 100644
--- a/src/lib/components/StatusBar.svelte
+++ b/src/lib/components/StatusBar.svelte
@@ -20,6 +20,7 @@
   import KeyboardShortcutsModal from "./KeyboardShortcutsModal.svelte";
   import { achievementProgress } from "$lib/stores/achievements";
   import SessionHistoryPanel from "./SessionHistoryPanel.svelte";
+  import GitPanel from "./GitPanel.svelte";
 
   const DISCORD_URL = "https://chat.nhcarrigan.com";
   const DONATE_URL = "https://donate.nhcarrigan.com";
@@ -35,6 +36,7 @@
   let showHelp = $state(false);
   let showKeyboardShortcuts = $state(false);
   let showSessionHistory = $state(false);
+  let showGitPanel = $state(false);
   const progress = $derived($achievementProgress);
   let currentConfig: HikariConfig = $state({
     model: null,
@@ -233,6 +235,20 @@
         />
       </svg>
     </button>
+    <button
+      onclick={() => (showGitPanel = true)}
+      class="p-1 text-gray-500 hover:text-[var(--accent-primary)] transition-colors"
+      title="Git Panel"
+    >
+      <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M13.828 10.172a4 4 0 00-5.656 0l-4 4a4 4 0 105.656 5.656l1.102-1.101m-.758-4.899a4 4 0 005.656 0l4-4a4 4 0 00-5.656-5.656l-1.1 1.1"
+        />
+      </svg>
+    </button>
     <button
       onclick={() => (showStats = !showStats)}
       class="p-1 text-gray-500 hover:text-[var(--accent-primary)] transition-colors {showStats
@@ -391,3 +407,7 @@
 {#if showSessionHistory}
   <SessionHistoryPanel onClose={() => (showSessionHistory = false)} />
 {/if}
+
+{#if showGitPanel}
+  <GitPanel isOpen={showGitPanel} onClose={() => (showGitPanel = false)} />
+{/if}