Add interactive rebase

This commit is contained in:
Chalarangelo
2021-04-08 20:10:35 +03:00
parent e28b27604d
commit 251da2fafa

View File

@ -0,0 +1,24 @@
---
title: Perform an interactive rebase
tags: branch,advanced
---
Performs an interactive rebase.
- Use `git rebase -i <commit>` to perform an interactive rebase.
- You can edit the rebase file to change the order of the commits and the action to perform for each one (pick, squash, drop, reword etc.).
- You can optionally use the `--autosquash` option to automatically squash fixup commits.
- If you have merge conflicts or stop to make changes, you can continue the rebase when ready using `git rebase --continue` or abort it using `git rebase --abort`.
```sh
git rebase -i [--autosquash] <commit>
```
```sh
git rebase -i 3050fc0de
# Performs an interactive rebase starting from `3050fc0de`
git rebase -i --autosquash HEAD~5
# Performs an interactive rebase of the last 5 commits,
# automatically squashing fixup commits
```