Git rebase入門 - 履歴を整理するリベースの使い方

1

git --version

1

git rebase <ベースブランチ>

1
2
3
4
5

# featureブランチに切り替え
git switch feature

# mainブランチの先端にリベース
git rebase main

1

Successfully rebased and updated refs/heads/feature.

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28

# 練習用ディレクトリを作成して移動
mkdir git-rebase-practice
cd git-rebase-practice

# Gitリポジトリを初期化
git init

# 最初のファイルを作成してコミット
echo "# My Project" > README.md
git add README.md
git commit -m "Initial commit"

# mainブランチで追加のコミットを作成
echo "## 概要" >> README.md
git add README.md
git commit -m "Add overview section"

# featureブランチを最初のコミットから作成
git switch -c feature HEAD~1

# featureブランチで変更を加える
echo "config.json" > .gitignore
git add .gitignore
git commit -m "Add gitignore"

echo "node_modules/" >> .gitignore
git add .gitignore
git commit -m "Ignore node_modules"

1

git log --oneline --graph --all

1
2
3
4
5

* 3f4g5h6 (HEAD -> feature) Ignore node_modules
* 2e3f4g5 Add gitignore
| * 1d2e3f4 (main) Add overview section
|/
* a1b2c3d Initial commit

1
2

# featureブランチをmainの先端にリベース
git rebase main

1

Successfully rebased and updated refs/heads/feature.

1

git log --oneline --graph --all

1
2
3
4

* 7h8i9j0 (HEAD -> feature) Ignore node_modules
* 6g7h8i9 Add gitignore
* 1d2e3f4 (main) Add overview section
* a1b2c3d Initial commit

1

git rebase -i <対象のコミット>

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18

pick a1b2c3d First commit
pick b2c3d4e Second commit
pick c3d4e5f Third commit

# Rebase 1234567..c3d4e5f onto 1234567 (3 commands)
#
# Commands:
# p, pick <commit> = use commit
# r, reword <commit> = use commit, but edit the commit message
# e, edit <commit> = use commit, but stop for amending
# s, squash <commit> = use commit, but meld into previous commit
# f, fixup [-C | -c] <commit> = like "squash" but keep only the previous
#                    commit's log message, unless -C is used, in which case
#                    keep only this commit's message; -c is same as -C but
#                    opens the editor
# x, exec <command> = run command (the rest of the line) using shell
# b, break = stop here (continue rebase later with 'git rebase --continue')
# d, drop <commit> = remove commit

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20

# 練習用の状況を作成
mkdir squash-practice
cd squash-practice
git init

echo "# TODO App" > README.md
git add README.md
git commit -m "Initial commit"

echo "- Add task" >> README.md
git add README.md
git commit -m "Add task feature"

echo "- Complete task" >> README.md
git add README.md
git commit -m "Add complete feature"

echo "- Delete task" >> README.md
git add README.md
git commit -m "Add delete feature"

1

git log --oneline

1
2
3
4

d4e5f6g (HEAD -> main) Add delete feature
c3d4e5f Add complete feature
b2c3d4e Add task feature
a1b2c3d Initial commit

1

git rebase -i HEAD~3

1
2
3

pick b2c3d4e Add task feature
squash c3d4e5f Add complete feature
squash d4e5f6g Add delete feature

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12

# This is a combination of 3 commits.
# This is the 1st commit message:

Add task feature

# This is the commit message #2:

Add complete feature

# This is the commit message #3:

Add delete feature

1
2
3
4
5

Add task management features

- Add task feature
- Complete task feature
- Delete task feature

1
2
3
4

[detached HEAD e5f6g7h] Add task management features
 Date: Wed Jan 1 12:00:00 2026 +0900
 1 file changed, 3 insertions(+)
Successfully rebased and updated refs/heads/main.

1

git log --oneline

1
2

e5f6g7h (HEAD -> main) Add task management features
a1b2c3d Initial commit

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18

# 練習用の状況を作成
mkdir fixup-practice
cd fixup-practice
git init

echo "# API Documentation" > README.md
git add README.md
git commit -m "Add API documentation"

echo "## Endpoints" >> README.md
git add README.md
git commit -m "Add endpoints section"

# タイポを見つけて修正
sed -i 's/Endpoints/API Endpoints/' README.md  # Linux/macOS
# Windows PowerShellの場合: (Get-Content README.md) -replace 'Endpoints', 'API Endpoints' | Set-Content README.md
git add README.md
git commit -m "Fix typo"

1

git rebase -i HEAD~2

1
2

pick b2c3d4e Add endpoints section
fixup c3d4e5f Fix typo

1

Successfully rebased and updated refs/heads/main.

1

git log --oneline

1
2

f6g7h8i (HEAD -> main) Add endpoints section
a1b2c3d Add API documentation

1
2
3
4
5

# 修正対象のコミットを指定してfixupコミットを作成
git commit --fixup=<対象コミットのハッシュ>

# 自動的にfixupを適用するリベース
git rebase -i --autosquash HEAD~3

1
2

# 直近3件のコミットを対象にインタラクティブリベースを開始
git rebase -i HEAD~3

1
2
3

pick a1b2c3d Initial commit
reword b2c3d4e Add feature
pick c3d4e5f Fix bug

1
2
3
4
5

Add user authentication feature

- Implement login functionality
- Add session management
- Create logout endpoint

1
2
3
4
5
6

CONFLICT (content): Merge conflict in README.md
error: could not apply b2c3d4e... Add feature
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add <pathspec>", then run "git rebase --continue".
hint: You could also run "git rebase --skip" to skip this commit,
hint: or run "git rebase --abort" to cancel the rebase.

1

git status

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12

interactive rebase in progress; onto a1b2c3d
Last command done (1 command done):
   pick b2c3d4e Add feature
Next commands to do (2 remaining commands):
   pick c3d4e5f Fix bug
   pick d4e5f6g Update docs
You are currently rebasing branch 'feature' on 'a1b2c3d'.
  (fix conflicts and then run "git rebase --continue")

Unmerged paths:
  (use "git add <file>..." to mark resolution)
        both modified:   README.md

1

cat README.md

1
2
3
4
5
6
7
8

# My Project
<<<<<<< HEAD
## Overview
This is the main project.
=======
## Description
This is a feature branch.
>>>>>>> b2c3d4e (Add feature)

1
2
3

# My Project
## Overview
This is the main project with new features.

1

git add README.md

1

git rebase --continue

1

git rebase --abort

1

git rebase --skip

1
2
3

# プッシュ前のローカルブランチでリベース
git switch feature
git rebase main

1
2

# プルリクエスト作成前にインタラクティブリベースで整理
git rebase -i main

1
2

# 安全な強制プッシュ
git push --force-with-lease origin feature

1
2

# reflogで履歴を確認
git reflog

1
2
3
4
5

e5f6g7h (HEAD -> feature) HEAD@{0}: rebase (finish): returning to refs/heads/feature
e5f6g7h HEAD@{1}: rebase (pick): Add feature
a1b2c3d HEAD@{2}: rebase (start): checkout main
d4e5f6g HEAD@{3}: commit: Add feature
c3d4e5f HEAD@{4}: commit: Initial setup

1
2

# リベース前の状態に戻す
git reset --hard HEAD@{3}

1
2
3
4
5
6
7
8
9

# mainブランチを最新化
git switch main
git pull origin main

# 機能ブランチに切り替え
git switch feature

# mainブランチの先端にリベース
git rebase main

1
2
3
4
5
6

# mainブランチとの分岐点を確認
git merge-base main feature
# 出力: a1b2c3d

# 分岐点以降のコミットをインタラクティブリベース
git rebase -i a1b2c3d

1

git rebase -i HEAD~4

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11

# 変更前
pick a1b2c3d Add feature A
pick b2c3d4e Add feature B
pick c3d4e5f Fix feature A
pick d4e5f6g Add feature C

# 変更後（feature Aの修正をfeature Aの直後に移動）
pick a1b2c3d Add feature A
pick c3d4e5f Fix feature A
pick b2c3d4e Add feature B
pick d4e5f6g Add feature C

1
2
3
4
5

# VS Codeをエディタに設定
git config --global core.editor "code --wait"

# Vimを使用する場合
git config --global core.editor "vim"

1

git rebase --abort

1
2

# rerereを有効化
git config --global rerere.enabled true