Skip to content

Latest commit

 

History

History
22 lines (15 loc) · 2.08 KB

2014-09-07-git-references.markdown

File metadata and controls

22 lines (15 loc) · 2.08 KB
layout title date comments categories
post
Git References
2014-09-07 20:25:50 -0400
true
git

I've spent a lot of time in the last month working with Git. (Please note: Not Github, but Git.) While I've used it in passing here and there, I've never committed myself to it. I've been working on that. I've set up a Git server, worked out a couple different workflows where multiple people could contribute to the source code, and just learned the ins and outs by hard experience.

I didn't realize how little I knew until I was knee deep in doing it.

That's all a preface for three links today that I want to put a bookmark on for my own future reference:

  • "Git Pretty" is a handy flowchart that shows you which command you need to use to fix something or make something prettier in Git.

  • The chapter of the Git Book that deals with commit messages has some wise things to say about how to format your messages, what to include in them, etc. There are many variations available depending on what kind of workflow you're using Git with. Obviously, the whole Git Book is a must read, but this is a particular thing I'm working on at the moment, so I'm marking it here.

  • And, of course, there's the classic Git Flow blog post. It looks wild and overwhelming at first, but once you start using it, it all makes sense. I've just incorporated the devel branch idea so far, but I'm somewhat confident I could branch out into a bug fix or a hot fix if the need be.

  • Bonus Bullet Point: Here's a great chart that shows you the Git commands you'll need for the Git Flow approach.

There are still parts that feel mysterious or that I'm not completely sure I'm doing "right," but I'm starting to get the hang of it. It beats the heck out of saving .bkp files in subdirectories...