git rebase -i a branch onto itself

git git-interactive-rebase
ndp picture ndp · Oct 22, 2012 · Viewed 11.6k times · Source

I had the following in my repo

Master---
     \
       Next-->Commit A.1,Commit A.2,Commit A.3 --......

I want to fix-up the A.* commits into one commit describing the feature A. I tried git rebase -i origin next, but that didn't work how I expected. Is there any way of accomplishing this?

I thought of creating a branch foo, which is essentially next, and then rebase next onto foo followed by merge/delete foo. However, this seems sloppy.

Answer

Mark Longair picture Mark Longair · Oct 22, 2012

You just need to do:

git rebase -i <COMMIT-ISH>

... where <COMMIT-ISH> is some way of referring to the commit marked Master in your diagram. If there's a branch pointing to that point (probably master or origin/master) then git log --decorate will show that.

Related questions

Merge commits don't appear in git rebase --interactive

git log reveals the following: commit 1abcd[...] Author: [...] Date: [...] [Useful commit] commit 2abcd[...] Author: [...] Date: [...] Merge branch [...] of [etc. etc.] commit 3abcd[...] Author: [...] Date: [...] [Useful commit] That merge commit is useless to me - it doesn't represent a meaningful state …

Read More
How do I rebase while skipping a particular commit?

Is there a way to rebase a branch onto another while skipping a particular (conflicting) commit on the other branch? For example, I want to rebase mybranch onto master, but master contains a commit that will conflict with the commits …

Read More
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 log like this: * 5e32fb0 (HEAD -> master) Add latest feature * 106c31a Add new feature * 2bdac33 Add great …

Read More