Git: move a commit "on top"

git branch git-rebase
Adrian Panasiuk picture Adrian Panasiuk · Jan 24, 2013 · Viewed 25.4k times · Source

Let's say in master I have a feature disabled. I work on that feature on branch feature, so I have a special commit $ there that just enables that feature. Now I want to merge the changes I did in feature into master, but keep the enabling commit out. So it's like

main:    A--B--X--Y
feature: A--B--$--C--D

So let's say I want to do it, by moving the $ commit on top of feature:

new feature: A--B--C--D--$

How would I go about doing that?

Answer

Carl Norum picture Carl Norum · Jan 24, 2013

git rebase -i B, and then move $ to the end of the list that shows up in your editor. It will start out as the first line in the file that opens. You could also just delete that line entirely, which will just drop that commit out of your branch's history.

Related questions

Rebasing a branch including all its children

I have the following Git repository topology: A-B-F (master) \ D (feature-a) \ / C (feature) \ E (feature-b) By rebasing feature branch I expected to rebase the whole subtree (including child branches): $ git rebase feature master A-B-F (master) \ D (feature-a) \ / C (feature) \ E (…

Read More
"git pull --rebase" leads to "Cannot rebase onto multiple branches"

So, my work environment has precisely one branch with a remote companion on Github. I'm trying to do git pull --rebase in order to prevent git push from creating merge commit messages that don't provide new information to others working …

Read More
Why isn't 'git bisect' branch aware?

I'm trying to find the source of a bug that's come up since a commit in the past day on a long lived branch (which will be released much much later) called feature-x. There's a bug though. I find behavior …

Read More