# Gitrebase

> Rebase branches onto upstream main with automatic base detection Use when this capability is needed.

- Skill: `tomevault-io/gitrebase` (Agent Skill, multi-file: 2 files)
- Install (CLI): `npx skillmds@latest add tomevault-io/gitrebase`
- Raw SKILL.md: https://api.skillmd.com/api/skills/tomevault-io/gitrebase/raw
- Safety review: pending (external: skill-scanner PASS, skillspector PASS)
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: tomevault-io (https://skillmd.com/u/tomevault-io)
- Updated: 2026-09-17
- Page: https://skillmd.com/skills/tomevault-io/gitrebase

---


# Git Rebase

Rebase the current branch onto the upstream main branch. Uses a pattern that auto-detects the correct upstream remote and main branch.

## When to Use

- Before creating a PR (ensure clean history)
- After upstream main has new commits
- During TDD iterations when CI requires a rebase
- When PR has merge conflicts

## Quick Rebase (gfur alias)

The `gfur` alias automatically finds the upstream remote and main branch:

```bash
# Define gfur (add to ~/.bashrc or ~/.zshrc)
alias gfur='git fetch upstream && git rebase upstream/$(git symbolic-ref refs/remotes/upstream/HEAD | sed "s@^refs/remotes/upstream/@@")'
```

Use it:

```bash
gfur
```

If upstream/HEAD is not set:

```bash
git remote set-head upstream -a
```

## Manual Rebase

```bash
git fetch upstream main
```

```bash
git rebase upstream/main
```

## Rebase Conflicts

If conflicts occur during rebase:

```bash
# Check which files conflict
git status
```

Fix the conflicts, then:

```bash
git add <fixed-files>
```

```bash
git rebase --continue
```

To abort:

```bash
git rebase --abort
```

## Sign All Commits After Rebase

After rebasing, ensure all commits are signed (required by Kagenti):

```bash
git rebase --signoff HEAD~$(git rev-list --count upstream/main..HEAD)
```

## Related Skills

- `git:commit` - Commit format and conventions
- `git:worktree` - Parallel development with worktrees
- `tdd:ci` - TDD workflow that needs rebase before push

---
> Converted and distributed by [TomeVault](https://tomevault.io/claim/kagenti) — claim your Tome and manage your conversions.
<!-- tomevault:4.0:skill_md:2026-04-11 -->