House 9

Friday, February 3, 2012

Git Workflow

This is the current git workflow we are using at work, your mileage may vary:




Resources
  • http://cheat.errtheblog.com/s/git 
  • http://yanpritzker.com/gitbook.html#Keeping+a+topic+branch+in+sync+with+its+parent 
  • http://yanpritzker.com/gitbook.html#One+branch+per+bug 
  • http://gitready.com/beginner/2009/02/02/push-and-delete-branches.html 
  • http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html 
  • http://sleeplessgeek.blogspot.com/2011/03/using-git-cherry-pick.html 
Posted by House 9 at 6:06 PM 0 comments
Labels: git, tfs
Newer Posts Older Posts Home
Subscribe to: Posts (Atom)

Blog Archive

  • ▼  2012 (3)
    • ►  April (2)
      • postgres: random useful things
      • postgres: terminate all database connections
    • ▼  February (1)
      • Git Workflow
  • ►  2011 (33)
    • ►  December (2)
      • Inspect all jQuery events on an element
      • Get table and column information in postgres
    • ►  November (2)
      • Sample Routes and Links with Rails 3 in the consol...
      • Postgres: get the number of days in an interval
    • ►  October (1)
      • Generating barcodes with ruby and rails
    • ►  September (1)
      • NFL 2011 Sunday Night HD Stream for Free from NBC
    • ►  August (1)
      • CoffeeScript with Rails 2.3 and Rails 3.0
    • ►  July (1)
      • Grow vegetables go to jail?
    • ►  June (3)
      • rails 3.1 and ruby-1.9.2-p180 - rake aborted! stac...
      • rails 3.1 asset gem
      • robocopy fix for exit code of 2
    • ►  May (5)
      • rails 3.1 javascript execution
      • rails 3.1 asset pipeline
      • Stream Tennis - 2011 Roland Garros
      • AT&T site has some serious issues
      • Simple.Data and MongoDB
    • ►  April (6)
      • Fixing asp.net MVC AuthorizeAttribute
      • Log: Wildlife sightings summer 2010
      • Notes - TeamCity setup on Ubuntu
      • Some notes - Ubuntu install rails 3 environment
      • Could not find generator delayed_job_migration.
      • Ping Guest OS from Host OS with VirtualBox
    • ►  March (8)
      • Add tf.exe and other .net command line tools to yo...
      • Rows and Columns with CSS
      • asp mvc jquery from cdn with fallback to localhost...
      • Powershell script to generate a TODO report
      • MSTest output result to HTML
      • Visual Studio Solution Items in a sub directory
      • Ergonomic keyboard for the Mac
      • varchar (MAX) SqlParameter length
    • ►  February (3)
      • CQRS with .NET and C#
      • OSHA Safety Software
      • LibreOffice - the real Open Office
  • ►  2010 (35)
    • ►  November (3)
      • ASP MVC Razor templates with nested layout and sec...
      • Automapper Datatable to List
      • Get the date of the beginning and end of a month u...
    • ►  October (4)
      • Remote desktop mac OSX to Ubuntu
      • The best overload for 'RenderSection' does not hav...
      • jQuery iframe auto height plugin
      • Geek Desk in Action!
    • ►  September (6)
      • VirutalBox - Increase the memory on an existing gu...
      • Textmate Go to File now available in Visual Studio...
      • A code smell - try catch that swallows an exceptio...
      • NFL Live Stream Thursday and Sunday night on NBC
      • 2010 US Open live high quality stream
      • You have got to be kidding
    • ►  August (3)
      • ruby 1.9.2 and rails 3rc with rvm
    • ►  July (1)
    • ►  June (2)
    • ►  May (2)
    • ►  April (3)
    • ►  March (5)
    • ►  February (2)
    • ►  January (4)
  • ►  2009 (39)
    • ►  December (1)
    • ►  November (2)
    • ►  October (3)
    • ►  September (2)
    • ►  August (3)
    • ►  July (1)
    • ►  June (6)
    • ►  May (3)
    • ►  April (8)
    • ►  March (3)
    • ►  February (2)
    • ►  January (5)
  • ►  2008 (34)
    • ►  December (2)
    • ►  November (1)
    • ►  October (5)
    • ►  September (1)
    • ►  August (5)
    • ►  July (1)
    • ►  June (2)
    • ►  May (7)
    • ►  April (3)
    • ►  March (1)
    • ►  February (5)
    • ►  January (1)
  • ►  2007 (30)
    • ►  December (5)
    • ►  November (1)
    • ►  October (4)
    • ►  September (4)
    • ►  May (1)
    • ►  April (2)
    • ►  March (3)
    • ►  February (7)
    • ►  January (3)
  • ►  2006 (7)
    • ►  December (7)

Flickr Photostream

JS Function .constructor

Subscriptions

rails code coding cycling ruby ubuntu jquery postgresql spain Australia birds firefox javascript mvc tfs nant arizona misc mssql sql virtual visual studio IDE bike ride computers css heroku nfl tennis unit test CQRS IE8 WTF appcelerator books csharp git iframe metal mongoDB mstest music pomodoro powershell python rake razor real estate redcar regex rhino.mocks rjs rspec rvm scRUBYt sitemap teamcity tour of california valid html web2py webmaster tools xhtml

Quote of the Day

My name is Jesse House, I am a Web Developer who enjoys building applications using both Ruby on Rails and ASP MVC.
You can contact me via email at jesse <dot> house <at> gmail <dot> com or if you want to send me spam, please send it to jesse.house@yahoo.com.
You can learn more about me from my LinkedIn profile: View Jesse House's profile on LinkedIn

Books I have read recently:

The Man from Beijing
Blood, Bones & Butter: The Inadvertent Education of a Reluctant Chef
Eloquent Ruby
The Mindbody Prescription: Healing the Body, Healing the Pain
MongoDB: The Definitive Guide
JavaScript Patterns
Lean Architecture
Test-Drive ASP.NET MVC
The Lost Symbol
Metaprogramming Ruby
A New Earth: Awakening to Your Life's Purpose
Rework
Ruby Best Practices
JavaScript: The Good Parts
jQuery Cookbook
Pro Git
Don't Make Me Think: A Common Sense Approach to Web Usability
Developer's Guide to Web Application Security
}
Click to see what I am currently reading:
Jesse House's book recommendations, liked quotes, book clubs, book trivia, book lists (currently-reading shelf)
Powered by Blogger.