GitHub Flow – Scott Chacon. August 31, 2011 Issues with git-flow I travel all over the place teaching Git to people and nearly every class and workshop I’ve done recently has asked me what I think about git-flow.
I always answer that I think that it’s great - it has taken a system (Git) that has a million possible workflows and documented a well tested, flexible workflow that works for lots of developers in a fairly straightforward manner. It has become something of a standard so that developers can move between projects or companies and be familiar with this standardized workflow. However, it does have its issues. One of the bigger issues for me is that it’s more complicated than I think most developers and development teams actually require. Both of these issues can be solved easily just by having a much more simplified process.
Its simplicity gives it a number of advantages. GitHub Flow So, why don’t we use git-flow at GitHub? There are a number of advantages to deploying so regularly. How We Do It. Must Have Git Aliases: Advanced Examples - Be Present Now. Over the course of a few years I piled up a long list of git aliases.
This post will assume you know what aliases are and you have defined a few for yourself. I rely on many of them dozens of times a day. And maybe some have slipped your radar. Maybe you've never thought you could do some of these useful things with an alias. Let me show you some of the cool things you can do. You can add all the examples below to the [alias] section of your .gitconfig. To acquire the full list of my aliases you can check out my .gitconfig on Github. Explore your history, the commits and the code Shorten and beautify your log command because you will use it a lot.
List commits in short form, with colors and branch/tag annotations. And you can have it by adding this to your aliases section: ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate List commits showing changed files is invoked with git ll and looks like this: And you can have it with this: Using Git for Deployment - Dan Barber. I’ve been using Git for deployment now for some time, and I thought it might be helpful to others if I document how I did it.
Partly this is because I can’t find the original guide that I used, so if you recognise the method I use here and you did it first, let me know and I’ll attribute you! Update: This is the original article: Thanks to Tim for the link in his comment! For the purposes of this guide I’m going to assume that you have your website live already, and that it is not already in a Git repository. If your situation is different you will have to adapt the steps accordingly. Setting up the server In order for this to work it will require two repositories on the server itself. We’ll start by initialising a repository in the live code directory on the server and committing the entire codebase. . $ cd /var/www/myproject $ git init Initialized empty Git repository in /var/www/myproject $ git add . $ git commit Configuration and hooks Next we need to set up a couple of hooks.
. #! #! #! Brackets - A modern, open source code editor that understands web design. An official flavour of Ubuntu, featuring the GNOME desktop environment. Vagrant. UbuntuUpdates - PPA: Chris Lea Nodejs. This repository is available for: Lucid Precise Saucy Trusty Utopic To install this PPA: sudo add-apt-repository ppa:chris-lea/node.js sudo apt-get update sudo apt-get install <package name> where UbuntuUpdates arbitrarily picked nodejs as the main package of this PPA.
See packages for selected release: Lucid Precise Saucy Trusty Utopic Deleted packages are displayed in grey. Head packages Dependent packages. Apt-get. Other installs.