Top "Rebase" questions

Change root of a branch in git

I'm using git and want to change the base of an exiting branch. This is caused by a deployment system, …

git tags branch reset rebase

Gerrit always rebase before submit patchset to avoid a merge commit

I found that when clicking "Submit Patch Set" in the Gerrit web interface, it'll either simply add a commit to …

merge submit gerrit rebase

How do I recover/resynchronise after someone pushes a rebase or a reset to a published branch?

We have all heard that one should never rebase published work, that it’s dangerous, etc. However, I have not …

git rebase git-rebase git-reset

Git: Interactively rebase a range of commits

I'm trying to rebase -i a few commits that occurred a while back in my history. Say I have a …

git rebase git-interactive-rebase

How to prevent lot of git conflicts when git rebasing lot of commits?

Story: in the middle of a project my colleague created a new branch from master and started doing her heavy …

git rebase git-rebase

How to git rebase -i for a range of commits?

Can I squash a range of commits for a local feature/topic branch using rebase that does not include the …

git commit git-branch rebase git-rebase

Pull, rebase, push, in one command (or just a few)

When using Git, I often find myself doing the following when working in master: # work work work... $ git checkout -b …

git merge rebase git-rebase

When I am using Git, should I rebase before I merge?

I am working on a large scale Rails project, and the team I am working with is using Github to …

git merge github rebase

Git squash all commits in branch without conflicting

A common development workflow for us is to checkout branch b, commit a bunch to it, then squash all those …

git rebase squash

Can I rebase a Git branch without modifying my working copy?

Suppose I have my "master" branch checked out. I've committed some production changes to "master", and now I want to …

git rebase