Top "Rebase" questions

Changing the starting point of a branch in a Version Control System.

Squash my last X commits together using Git

How can I squash my last X commits together into one commit using Git?

git rebase squash git-squash
Git refusing to merge unrelated histories on rebase

During git rebase origin/development the following error message is shown from Git: fatal: refusing to merge unrelated histories Error …

git rebase
Undoing a git rebase

Does anybody know how to easily undo a git rebase? The only way that comes to mind is to go …

git rebase git-rebase undo
git cherry-pick says "...38c74d is a merge but no -m option was given"

I made some changes in my master branch and want to bring those upstream. when I cherry-pick the following commits …

git merge rebase cherry-pick
Git push rejected "non-fast-forward"

I am fairly new to git yet currently using it to manage our code in a team environment. I had …

git push rebase
How to squash all git commits into one?

How do you squash your entire repository down to the first commit? I can rebase to the first commit, but …

git rebase git-rebase squash git-rewrite-history
git rebase fatal: Needed a single revision

I have a branch of a public repository and I am trying to update my branch with the current commits …

git github rebase
Git: How to rebase to a specific commit?

I'd like to rebase to a specific commit, not to a HEAD of the other branch: A --- B --- …

git version-control rebase git-rebase
How to get "their" changes in the middle of conflicting Git rebase?

I have conflicting branches, branch2 branched from branch1. Let's say when rebasing branch2 on current branch1, while resolving conflicts, I …

git rebase git-rebase