Top "Rebase" questions

How do you rebase the current branch's changes on top of changes being merged in?

Okay. If I'm on a branch (say working), and I want to merge in the changes from another branch (say …

git merge rebase git-rebase

In git, what is the difference between merge --squash and rebase?

I'm new to git and I'm trying to understand the difference between a squash and a rebase. As I understand …

git merge rebase git-rebase squash

Squash the first two commits in Git?

With git rebase --interactive <commit> you can squash any number of commits together into a single one. That's …

git rebase git-rebase squash

How to abort an interactive rebase if --abort doesn't work?

I've got myself into a muddle via an interactive rebase, and I now wish to abort it. (i.e. go …

git exit rebase abort quit

Rebasing remote branches in Git

I am using an intermediate Git repository to mirror a remote SVN repository, from which people can clone and work …

git version-control branch rebase feature-branch

Change first commit of project with Git?

I want to change something in the first commit of my project with out losing all subsequent commits. Is there …

git rebase git-filter-branch

Change old commit message on Git

I was trying to edit an old commit message as explained here. The thing is that now, when I try …

git repository rebase git-rebase

Remove folder and its contents from git/GitHub's history

I was working on a repository on my GitHub account and this is a problem I stumbled upon. Node.js …

git github rebase git-rebase

How can I combine two commits into one commit?

I have a branch 'firstproject' with 2 commits. I want to get rid of these commits and make them appear as …

git merge branch git-svn rebase

Rebasing a Git merge commit

Take the following case: I have some work in a topic branch and now I'm ready to merge back to …

git merge rebase git-rebase git-rewrite-history