![]() In your case, you only did a rebase with a single commit that you then amended. Your original commit will then have been patched with the fix. save the file one it open, and then wait for the rebase to complete.use git rebase -interactive -autosquash bffd858~1 to rebase,.use git commit -fixup=bffd858 when committing your fix,.Usually the easiest way to apply a bug fix and to correct the history is to: You should instead have done: $ git rebase -interactive bffd858~1Īnd changed the file so that it read: pick bffd858 popups and modals In your case, you wanted to modify bffd858, whose parent is d95c5f4 also known as bffd858^ or bffd858~1 (I prefer that last syntax since it works with shell that do interpret ^ as a special character). Your error is that when you do a rebase, you want to give the id of the parent of the earliest commit you want to modify. I've apply my bug-fix and typed $ git commit -a -amendĪnd then I've found my bug-fix in '8cd26ba' ( last commit)! Once you are satisfied with your changes, run # However, if you remove everything, the rebase will be aborted. # If you remove a line here THAT COMMIT WILL BE LOST. # x, exec = run command (the rest of the line) using shell # f, fixup = like "squash", but discard this commit's log message # s, squash = use commit, but meld into previous commit # e, edit = use commit, but stop for amending # r, reword = use commit, but edit the commit message Git shows me (in nano) pick 6fa566b history server-side I've tried to amend 'bffd858' (because fix is related to it) as it described here. * d95c5f4 | Map update for new interactionĪnd when I've already committed '8cd26ba' I've found a bug in modal mechanism and want to fix it. I have the commit history as below: * 8cd26ba | history server-side (HEAD, noXHR)
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |