back to context overview

git-rebase

List of commands for git-rebase:

- git
git-rebase:tldr:12fb5 git-rebase: Rebase the current branch on top of another specified branch.

$ git rebase ${new_base_branch}

try on your machine

explain this command
- git
git-rebase:tldr:34e3a git-rebase: Auto-resolve any conflicts by favoring the working branch version (`theirs` keyword has reversed meaning in this case).

$ git rebase -X theirs ${branch_name}

try on your machine

explain this command
- git
git-rebase:tldr:44488 git-rebase: Abort a rebase in progress (e.g. if it is interrupted by a merge conflict).

$ git rebase --abort

try on your machine

explain this command
- git
git-rebase:tldr:9640a git-rebase: Start an interactive rebase, which allows the commits to be reordered, omitted, combined or modified.

$ git rebase -i ${target_base_branch_or_commit_hash}

try on your machine

explain this command
- git
git-rebase:tldr:a26ec git-rebase: Continue a rebase that was interrupted by a merge failure, after editing conflicting files.

$ git rebase --continue

try on your machine

explain this command
- git
git-rebase:tldr:c6f17 git-rebase: Continue a rebase that was paused due to merge conflicts, by skipping the conflicted commit.

$ git rebase --skip

try on your machine

explain this command
- git
git-rebase:tldr:e9841 git-rebase: Move part of the current branch onto a new base, providing the old base to start from.

$ git rebase --onto ${new_base} ${old_base}

try on your machine

explain this command

back to context overview