Christopher KadeThis post is aimed for people who want to learn how to use commands such as rebase & learn a few tricks to have a nicer Git experience.
Alright, let's start by watching the Git history of some of my first ever projects on Github:
Oh no
Oh no no no no
OH LORD WHAT HAVE I DONE
Now that I've ridiculed myself, let's check out what most of my projects look like now 😄
Oof, much better
If you don't know what this all means, let me explain briefly:
This is a representation of your Git history on Github, meaning the commits you've done over time on your project's branches.
You can see your own by navigating to the "Insights" tab of one of your projects, then going to the "Network" tab on the left.
The black bar represents my master branch and each alternating blue & green bars are separate branches.
As you can see on the more recent and nicer history, they alternately get merged into master, creating this nice flow of writing code & merging it (which is always recommended, instead of accumulating pull requests).
So, how can you have a cleaner history? Let's go over real use-cases.
Here's what we're covering today (make sure to do each section in order):
The magic of git rebase
Git rebase lets your remodel your history to your will. See it as a way to manipulate your list of commits on a given branch.
For example, you could drop commits completely (basically say goodbye to them in the abyss of git), rename them (rewriting your commit message), squash them into other commits (which is useful to hide commits that do small things such as adding a semicolon, you don't really want to see them in your history) and many more things.
Learning by practice
Go to the following project I made for the occasion, fork it and let's get started.
Forking is basically creating a copy of my project for yourself, you'll be able to mess around with it without any problems ! To do it, click on the fork button on the top right:
Then, clone the repository you forked.
Example 1: fixing up a commit with rebase
Scenario: you have committed something that does not deserve a commit of its own, or you want to reduce the number of commits on your branch to one before making a pull request.
From the
masterbranch, create a new branch.Create a new file, its content doesn't really matter.
Commit that new file to your branch.
git add index.js
git commit -m "add index.js"
Update something in that file
Commit it again with a message such as "update index.js"
Run
git log, as you can see, we now have 2 commits
We now want to fixup the update commit into the add commit, because this small change does not deserve a commit of its own.
To do so, we'll use the interactive mode of git rebase, which lets us apply the rebasing with a nice interface.
- Run the rebase command like so:
git rebase -i HEAD~2
HEAD~2 means start from the last commit on the branch (the head) and go back 2 commits. If we wanted to manipulate more commits, we could change the value to the far right.
You should now have an interface that looks something like this:
Don't panic, this only shows you the two commits you are changing at the top, and the available commands bellow them.
By default, the rebase interface uses Vim, to write in it, simply press the i key. You are now in "INSERT" mode. As we want to fixup the second commit in the first one, all we have to do is write fixup or f instead of pick in front of it. Our update index.js commit will now be squashed into the add index.js but only the add index.js's message will be kept.
- Update the second line like so:
pick c0091ec add index.js
f a19336e update index.js
Now, we want to apply the rebase, press escape to leave the INSERT mode, press : (colon) and enter wq for "write" and "quit" and press ENTER to apply these changes. The colon simply allows you to write commands for Vim to execute.
The following message should now appear in your console:
Successfully rebased and updated refs/heads/{YOUR BRANCH NAME}.
Check your git log, you now have one beautiful and clean commit !
- Finally, force push to that branch to apply the rebase to the remote server
git push origin {BRANCH-NAME} -f
The -f is essential as a rebase modifies your git history and requires to be forced.
Example 2: dropping a commit
These next 2 steps will be extremely similar to the first one because you now have the tools to do any kind of rebasing 🎉
Scenario: you want to completely remove a commit
We'll drop the add FILENAME commit we previously made:
- Run the rebase command
git rebase -i HEAD~1
- Add a
dordropin front of the commit you wish to drop.
Run
:wqin your Vim editor (and check withgit logthat the commit was dropped)Don't forget to force push it to your remote server 😀
Example 3: rewording a commit
Pretty similar, with one change.
Scenario: you want to fix a typo or rewrite a commit's title or description
- Create a random commit
- Run the rebase command
git rebase -i HEAD~1
Add a
rorrewordin front of the commit you wish to reword (no need to edit the title now).Run
:wqin your Vim editor. This will open a similar editor with the commit(s) you wish to reword.
- Update the commit's title and description to your will, run
:wqand that's it ! Check withgit logthat the rewording was applied
- Don't forget to force push it to your remote server 😀
Example 4: rebasing on master
This example isn't reproduced in the Github project, but feel free to test it out.
Scenario: you have multiple PRs (Pull Requests) open at the same time
You merge one PR, now, your second PR is not up to date with master, oh no !
This very frequent scenario will have us rebase our second PR on master so that it gets the new code merged from the first PR.
- From the branch you want to rebase (in our case, the second PR's branch), run the following:
git fetch
This downloads all the references our branch needs to apply the rebase.
- Then, execute the rebase like so:
git rebase origin/master
- Finally, run a
git push origin {MY-BRANCH} -fto apply the rebase to our remote server
Hurray !
Bonus: a better git log
Is your git log too much to handle?
Would you rather have a git log that is straight to the point and looks nicer?
Look no further ! Here's how you can achieve it, in your console, paste the following:
git config --global alias.lg "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
You've now created an alias to git log called git lg that will display the nicer output showed before. Try it out by typing git lg (or git lg -p to see the lines that have changed).
Thanks to Coderwall for this bonus ✨
On the dangers of force pushing & other things to note
Force pushing can be dangerous when working with a team as mentioned by Nick Huanca:
So another alternative may be --force-with-lease which "allows one to force push without the risk of unintentionally overwriting someone else’s work. It will update remote references only if it has the same value as the remote-tracking branch we have locally." Reference. Thanks for the tip Nick ! 😄
As you may have noted he also mentions git rebase --abort, which allows us to stop a rebasing mid-way through in case anything goes wrong. So if for any reason you mess up your rebase, git it a little --abort and start again.
Closing thoughts
Learning how to use Git is probably one of the most important skills we can acquire as developers. I hope some of you won't be as afraid of rebase as I was a while ago.
If this post has been helpful, please feel free to give it a ❤️🦄🔖 and to follow me on Twitter @christo_kade !
Thanks for the article! It was a nice read/refresher. Since the audience is for people wanting to up their git game, I would suggest adding some messaging around the dangers of "force push" and maybe reference force push with care which leverages
--force-with-leaseso people don't accidentally overwrite team pushes. :)Another noteworthy thing might be to
git rebase --abortif things go unexpectedly sideways during a rebase (conflicts or other strange/unexpected behavior). It's nice to know, especially when getting started, how to back out of a command safely.Thanks again!