MichaelOldroyd.co.uk

HTML5 WordPress Starter Theme

Roots is a WordPress starter theme based on HTML5 Boilerplate & Bootstrap. Modernize your WordPress theme development.

Our Magento Git Guide and Work Flow

A practical and simple guide to using Git for a staging/development/live Magento store environment. Providing examples and rules for best practice.

Git: changed files between two commits

If you need a list of all modified files between two commits, you can use the following command;

git diff --name-only SHA1 SHA2

You can also pipe the output to a file (in the parent directory) as follows;

git diff --name-only SHA1 SHA2 > ../filename.txt 

Via http://stackoverflow.com/a/1552353

Filed under Snippets

Phabricator

Phabricator is a suite of open source tools for peer code review, task management, and project communication.

How to Deal with Merge Conflicts in Git

GitLab CE 6.6 released

GitLab CE 6.6 released! Hello everyone! As you know, Gitlab is open source software made for collaborative coding. Today we released a new version of …

GitLab CE 6.5 released

GitLab CE 6.5 released! Hello everyone! As you know GitLab is open source software to collaborate on code. Today we released a new version of GitLab …

Disconnecting EGit from a Project in Eclipse

Eclipse LogoI have been using Git a lot more recently. Eclipse PDT is my editor of choice, and EGit has eased the transition to a version control centric workflow. Some of my project development environments are accessed via a Samba network share; unfortunately Git over Samba is sub-optimal at best. For a larger project I have been working on, a full repository refresh could take up to 30 minutes. This is obviously unacceptable, especially if you hope to commit often or create / switch feature branches.

Filed under Tutorials

A Rebase Workflow for Git

Avoiding Git Disasters: A Gory Story