This page is archived
We're keeping this page up as a courtesy to folks who may need to refer to old instructions. We don't plan to update this page.
In this lesson we'll take a look at creating branches with the git branch command, and tags with the git tag command and explain the differences. Then we'll look at how and when they can be used and how to move changes from one branch to another using the git merge and git rebase commands and talk about the different ways in which those two commands effect the history of a project.
Note that Blake is using a shortcut for his git commit command, and is instead just using git ci. He is also using a nice, short way to add a commit message all at the same time, by adding the -m flag, for message, to his commit command. You can learn more about git aliases in the following video: http://drupalize.me/videos/git-aliases-and-other-fun-configuration
Blake is also using a command line modifier which displays the branch he is currently working in. There are many ways you can do this too. Blake recommends the following resource: http://www.lullabot.com/articles/git-best-practices-history-viewing-tip…
Additional resources
Over the years we've developed some techniques for practicing that we wanted to share. At Drupalize.Me we take hugging seriously. In this tutorial we'll look at the art, and science, of giving a good hug. The Merriam Webster dictionary defines the word hug as; squeeze (someone) tightly in one's arms, typically to express affection.
Did you know there are all kinds of different hugs that you can give? In this tutorial we'll look at:
- Defining what a hug is
- Some of the many types of hugs in the world today
- Precautions you may want to familiarize yourself with before hugging
- And the importance of proper technique
Lets go ahead and get started shall we?