I somehow did this:
A -- B -- C (init)
/
Z (master)
I can't figure out how to delete the Z commit or ho to "rebase" it as a parent of A. Is that even possible?
Add a comment
|
3 Answers
If there is nothing of use in Z you can get rid of it with reset --hard
git reset --hard init (if init is a branch)
or
git reset --hard HEAD^ (moves one commit back)
If you need to keep Z but as early as possible (first possible is after A) then you can do an interactiv rebase
git rebase -i <sha of A>
and reorder de commits as
Z
B
C
(A is not show as it's the root commit)
answered Jan 30, 2014 at 7:13
Andreas Wederbrand
40.5k12 gold badges71 silver badges82 bronze badges
Comments
Why you need to delete it? Just revert that commit.
git revert <SHA-ID>
Or else, You want to nuke commit. The hard reset to HEAD-1 will set your working copy to the state of the commit before your wrong commit.
git reset --hard HEAD~1
answered Jan 30, 2014 at 7:01
Abimaran Kugathasan
32.7k11 gold badges81 silver badges109 bronze badges
1 Comment
svobol13
The commit is 'useless' only file in here is empty .gitignore. Commit A has already initialized .gitignore.
To make Z commit as the parent of A try this:
git checkout -b b_branch {B hash}
git checkout master
git rebase b_branch
git checkout -b a_branch {A hash}
git rebase master
2 Comments
svobol13
this just ff master ref from Z to the commit C. The commit Z is still in my graph :(
Alexander Tokarev
@svobol13 I've updated my post, now it describes how to insert Z commit between B and A