Git Integration

Overview

1Code includes a full-featured git client built into the interface. No need to switch to your terminal for:

Viewing diffs and file changes
Staging and committing
Creating and switching branches
Pushing and pulling
Creating pull requests
Viewing commit history

All git operations are integrated with the agent workflow, so you can review changes before committing and track what the agent has done.

The Git Panel

Access the git panel from any active chat: Location: Right sidebar > Git tab (or click the branch icon in the header) Sections:

Current branch: Shows active branch with status indicators
Changes: Unstaged and staged files with diffs
Commit: Commit message input and history
Remote: Push/pull/sync operations
Branches: List of local and remote branches

Viewing Changes

File Change List

The changes section shows all modified files:

Modified (yellow M): Existing file changed
Added (green A): New file created
Deleted (red D): File removed
Renamed (blue R): File moved/renamed
Untracked (gray ?): New file not yet staged

File counts: Header shows X changed, Y added, Z deleted

Viewing Diffs

Click any file to see a side-by-side diff:

Left pane: Original content (before changes)
Right pane: Modified content (after changes)
Highlighting: Red for removed lines, green for added lines
Line numbers: Click to reference specific lines

Diff options:

Toggle between unified and split view
Show/hide whitespace changes
Word diff for finer granularity

Inline Diffs

Agent messages show inline diffs for files they modify:

- const oldValue = "foo";
+ const newValue = "bar";
  const unchanged = "baz";

Click View Full Diff to see the complete file comparison.

Staging and Committing

Staging Files

Review changes

Look through modified files in the git panel.

Stage files

Stage individual files or all at once:Individual: Click the + icon next to a file All: Click Stage All button Selective: Click file > Select lines > Stage Selected Lines

Unstage if needed

Click the - icon next to staged files to unstage them.

Keyboard shortcuts:

S: Stage current file
U: Unstage current file
Cmd+A then S: Stage all files

Writing Commit Messages

Good commit messages help track changes: Format:

Brief summary (50 chars or less)

More detailed explanation if needed:
- What changed
- Why it changed
- Any breaking changes or notes

Refs: #123

Examples:

✅ Good:
Add user authentication with JWT tokens

Implements login/logout endpoints and middleware
for protecting routes. Uses bcrypt for hashing.

❌ Bad:
Update files
Fixed stuff
WIP

The agent often generates commit messages automatically. You can edit them before committing.

Creating Commits

Stage files

Make sure the files you want to commit are staged (green checkmark).

Write message

Enter a commit message in the input field.

Commit

Click Commit or press Cmd+Enter.

Verify

The commit appears in history with a hash and timestamp.

Atomic commits: You can also select specific files and click Commit Selected to commit only those files.

Working with Branches

Viewing Branches

The branches section shows: Current branch: Highlighted with a checkmark Local branches: Branches on your machine

Last commit date
Ahead/behind indicators (vs. remote)
Checked out in worktree indicator

Remote branches: Branches on GitHub/GitLab

Latest commit info
PR status if applicable

Creating Branches

Open branch dialog

Click New Branch in the git panel or the branch selector in the header.

Enter name

Follow naming conventions:

feature/add-user-auth
fix/memory-leak
refactor/simplify-api

Choose base branch

Select which branch to start from (usually main or master).

Create

Click Create to make the branch and switch to it.

Validation: 1Code checks for:

Valid characters (alphanumeric, dash, slash, underscore)
No double dots or consecutive slashes
Unique name (not already existing)

Switching Branches

Safety check

1Code verifies you have no uncommitted changes.If you do:

Commit your changes first
Stash them: git stash push -m "WIP"
Discard them (if you’re sure)

Select branch

Click the branch name in the git panel or use the branch selector dropdown.

Switch

1Code checks out the branch:

Working directory updates
Files change to match branch state
Agent context updates

Quick switch: Press Cmd+P > type branch name > Enter

Deleting Branches

Select branch

Right-click the branch you want to delete in the branches list.

Delete options

Choose:

Delete local: Remove branch from your machine only
Delete local and remote: Also delete from GitHub/origin

Force delete (if needed)

If branch has unmerged changes, you’ll be asked to confirm force delete.

Safety: You cannot delete:

The current branch
Branches checked out in other worktrees
Protected branches (main, master) without confirmation

Remote Operations

Pushing Changes

Commit first

Make sure your changes are committed.

Click push

In the git panel, click Push button.If this is your first push on this branch:

Branch is created on remote
Upstream tracking is set automatically
Future pushes are faster

Verify

Status changes to “Up to date with origin”.

Push indicators:

↑3: 3 commits ahead (need to push)
↓2: 2 commits behind (need to pull)
↑3 ↓2: Diverged (need to pull/rebase first)

Pulling Changes

Check for updates

Click Fetch to check for new commits without pulling.

Review incoming changes

See what commits will be pulled in the remote section.

Pull

Click Pull button.1Code uses git pull --rebase by default to keep history clean.

Handle conflicts (if any)

If conflicts occur:

Conflict markers appear in files
Resolve manually or click Abort Rebase
After resolving, click Continue Rebase

Auto-stash: Enable in settings to automatically stash uncommitted changes before pulling.

Syncing (Pull + Push)

Click Sync to pull and then push in one operation:

Fetches latest from remote
Rebases your commits on top
Pushes your commits to remote
Updates tracking information

Use cases:

Keeping feature branches up-to-date with main
Quick sync when collaborating
Before creating a PR

Force Push

Force pushing rewrites remote history. Only use when necessary and when you’re sure no one else is using the branch.

When to force push:

After amending a commit that was already pushed
After rebasing a feature branch
When you need to undo pushed commits

How to force push:

Hold Shift while clicking Push
Confirm the force push dialog
1Code uses --force-with-lease for safety

Protected branches: Force push is blocked on main, master, production unless you explicitly confirm.

Creating Pull Requests

Push your branch

Make sure all commits are pushed to remote.

Open PR dialog

Click Create PR in the git panel.

PR Details (auto-filled)

1Code pre-fills based on your commits:Title: Based on commit messages or branch nameDescription: Includes:

Summary of changes
List of commits
Files changed
Test results (if available)

Choose base branch

Select the branch to merge into (usually main).

Add reviewers (optional)

Select team members to review.

Create

Click Create Pull Request.Opens GitHub PR page in browser where you can finalize and submit.

PR templates: If your repo has a .github/pull_request_template.md, it’s automatically included.

PR Status in 1Code

Once a PR exists, the git panel shows:

PR number and status (open, merged, closed)
Review status: Approved, changes requested, pending
CI status: Passing, failing, in progress
Merge conflicts: If any exist
Quick actions: View on GitHub, update branch, merge

Commit History

View past commits in the history section: Information shown:

Commit hash (short and full)
Commit message
Author and timestamp
Tags (if any)
Branch indicators

Actions:

Click to view full diff
Copy hash for referencing
Revert commit (creates inverse commit)
Cherry-pick to another branch

Filtering:

Search by message or hash
Filter by author
Date range
Branch-specific history

Advanced Git Operations

Stashing Changes

Temporarily save uncommitted changes: Create stash:

Click Stash button
Enter optional message: “WIP: adding feature X”
Changes are saved and working directory is clean

Apply stash:

Click Stashes to see list
Click stash to preview
Apply: Restore without deleting stash
Pop: Restore and delete stash

Use cases:

Switching branches with WIP code
Quick experiments without committing
Temporarily removing changes to test something

Rebasing

Reapply commits on top of another branch: Interactive rebase:

Right-click a commit
Select Rebase from here
Choose operations:
- Pick: Keep commit as-is
- Reword: Change message
- Edit: Modify content
- Squash: Combine with previous
- Drop: Remove commit
Complete rebase

Common uses:

Clean up commit history before PR
Squash WIP commits into logical units
Update feature branch with main

Example:

Before rebase:
- Add feature (WIP)
- Fix typo
- Another fix
- Done!

After squash rebase:
- Add user authentication feature

Cherry-picking

Apply specific commits to current branch:

Find commit in history
Right-click > Cherry-pick
Commit is applied to current branch
Resolve conflicts if any
Complete cherry-pick

Use cases:

Port bug fix from one branch to another
Include specific feature without merging entire branch
Recover commits from abandoned branches

Merge vs Rebase

Operation	Merge	Rebase
History	Preserves complete history	Rewrites history
Graph	Creates merge commits	Linear history
Conflicts	Once, at merge time	Per commit being rebased
Safety	Non-destructive	Rewrites commits
Use for	Feature branches → main	Feature branches update

1Code default: Rebase for pulls, merge for PRs.

Git Configuration

Customize git behavior in Settings > Git:

User Information

Name: Your Name
Email: you@example.com

Used for commit attribution. Auto-detected from your global git config.

Signing Commits

Enable GPG commit signing:

Generate GPG key: gpg --gen-key
Add to GitHub: Settings > SSH and GPG keys
Configure in 1Code: Settings > Git > Enable Signing
All commits are now signed with your key

Verified badge appears on signed commits in GitHub.

Auto-fetch

Automatically fetch from remote:

Never: Manual fetch only
Every 5 minutes: Keep branches up-to-date
On focus: When you switch to 1Code

Default Behavior

Auto-stash on pull: Stash uncommitted changes automatically
Prune on fetch: Remove deleted remote branches
Fast-forward only: Prevent merge commits on pull
Sign commits: Require GPG signature

Troubleshooting

Can't switch branches - uncommitted changes

Solution:

# Option 1: Commit changes
git add .
git commit -m "WIP: in progress work"

# Option 2: Stash changes
git stash push -m "WIP"
# Later: git stash pop

# Option 3: Discard changes (careful!)
git reset --hard

Push rejected - remote has changes

Cause: Someone else pushed to the branch.Solution:

Click Pull to get their changes
Resolve any conflicts
Push again

Or use Sync to pull and push in one step.

Merge conflict after pull

Solution:

Open conflicted files (marked with ⚠️)

Look for conflict markers:

<<<<<<< HEAD
Your changes
=======
Their changes
>>>>>>> branch-name

Edit to keep the correct version
Remove conflict markers
Stage resolved files
Click Continue Rebase or commit

Rebase failed - can't continue

Solution:

Try to resolve conflicts as above
If stuck, click Abort Rebase
Everything returns to state before rebase
Try merging instead of rebasing

Accidentally committed to wrong branch

Solution:

# Undo commit but keep changes
git reset HEAD~1

# Switch to correct branch
git checkout correct-branch

# Commit again
git add .
git commit -m "Your message"

Or use the Revert button in commit history.

Lost commits after rebase

Recovery:

# Find lost commit hash
git reflog

# Look for your commit
# Example output:
# abc1234 HEAD@{1}: commit: Your lost commit

# Cherry-pick it back
git cherry-pick abc1234

Reflog keeps commits for 30 days by default.

Git Best Practices

Commit Often

Make small, frequent commits rather than large, infrequent ones. Easier to review and roll back if needed.

Descriptive Messages

Write clear commit messages explaining why, not just what. Future you will be grateful.

Pull Before Push

Always pull (or sync) before pushing to avoid conflicts and rejected pushes.

Review Diffs

Always review diffs before committing. Catch accidental changes or debug output.

Branch Naming

Use consistent naming: feature/, fix/, refactor/. Makes navigation and automation easier.

Clean History

Squash WIP commits before merging. Keep main branch history readable.

Keyboard Shortcuts

Action	Shortcut
Stage file	`S`
Unstage file	`U`
Commit	`Cmd+Enter`
Push	`Cmd+Shift+P`
Pull	`Cmd+Shift+L`
Sync	`Cmd+Shift+S`
View diff	`D`
Switch branch	`Cmd+B`
Create branch	`Cmd+Shift+B`
Git panel	`Cmd+G`

Next Steps

Worktrees

Learn how worktrees enable isolated development with built-in git support.

Automations

Trigger agents from git events like pushes, PR creation, or CI failures.

Background Agents

Background agents commit and push changes automatically as they work.

Configuration

Customize git behavior, signing, and integration settings.

Get Started

Core Features

Guides

Advanced

Documentation Index

​Overview

​The Git Panel

​Viewing Changes

​File Change List

​Viewing Diffs

​Inline Diffs

​Staging and Committing

​Staging Files

​Writing Commit Messages

​Creating Commits

​Working with Branches

​Viewing Branches

​Creating Branches

​Switching Branches

​Deleting Branches

​Remote Operations

​Pushing Changes

​Pulling Changes

​Syncing (Pull + Push)

​Force Push

​Creating Pull Requests

​PR Status in 1Code

​Commit History

​Advanced Git Operations

​Stashing Changes

​Rebasing

​Cherry-picking

​Merge vs Rebase

​Git Configuration

​User Information

​Signing Commits

​Auto-fetch

​Default Behavior

​Troubleshooting

​Git Best Practices

Commit Often

Descriptive Messages

Pull Before Push

Review Diffs

Branch Naming

Clean History

​Keyboard Shortcuts

​Next Steps

Worktrees

Automations

Background Agents

Configuration

Build docs developers (and LLMs) love

Overview

The Git Panel

Viewing Changes

File Change List

Viewing Diffs

Inline Diffs

Staging and Committing

Staging Files

Writing Commit Messages

Creating Commits

Working with Branches

Viewing Branches

Creating Branches

Switching Branches

Deleting Branches

Remote Operations

Pushing Changes

Pulling Changes

Syncing (Pull + Push)

Force Push

Creating Pull Requests

PR Status in 1Code

Commit History

Advanced Git Operations

Stashing Changes

Rebasing

Cherry-picking

Merge vs Rebase

Git Configuration

User Information

Signing Commits

Auto-fetch

Default Behavior

Troubleshooting

Git Best Practices

Keyboard Shortcuts

Next Steps