Rebasing is the process of moving the base of your branch upstream. Pretty cool! A linear Git history Rebasing With every commit you’re adding some more steps to the timeline – so if something goes wrong, you haven’t lost all that great work you did.
If you commit some bad code you can always go back in time to before it happened. If we’re working in a team we might have lots of people working on their own separate timelines ( Git branches), and sometimes their timelines might converge with our own ( merging), but time is basically linear. We can move backwards and forwards on our timeline by checking out different commits. Using Git is a bit like having access to our own time machine. We’ll need to use the rebase command – but first, let’s try to understand a little bit about it. You could also make changes to your last commit (such as adding or removing files) without changing the commit message: git add README.mdīut what if you’ve already pushed your commit, or even if it’s a few commits back? Happily, there’s a fairly straightforward way to edit your past commit messages – assuming you know which commit the one you want to edit is. Git commit -amend -m "Edited commit message" Here of code we’re adding the file README.md and removing the file wrong-file.md, then editing the commit message: git add README.md You can also add or remove files by making those changes before executing the amend command. Then edit your commit message, save the commit, and push your code to the repository.
If you run this with the -m flag, you can edit your commit message in the terminal at the same time: git commit -amend -m "Edited commit message" If the commit you want to change is the very last one you made, and the commit hasn’t been pushed yet, then amending it is very simple. Let’s look at a few ways to do just that.
We can change the commit message, or add or remove files if we need to. With Git, there are ways we can go back and edit our past commits. What if you need to do more than just edit a commit message? There are plenty of times I’ve accidentally included the wrong file in a commit, or else missed one change and had to push an extra commit to rectify it. Either way, bad commit messages are no good to anyone – you never know when you might need to check out a commit, and hunting through past commits for an elusive chunk of code can be a nightmare. Have you ever pushed some code with a bad commit message and wished you could go back in time and edit it? Perhaps you got two different commits mixed up, or maybe your commit message was insufficiently descriptive.
0 kommentar(er)
