Skip to content
PHP Developer

Freelance PHP Developer based in Manchester, UK

  • Home
  • Contact
  • CV
  • Services
  • Portfolio
  • Articles
  • Talks

Git

  • Home
  • Version Control
  • Git

Moving unstaged changes to another branch in Git

Posted by By Paul January 23, 2019Posted inGit, Version ControlNo Comments
If you move around between different branches a lot in Git, you might find that you accidentally make some changes on the wrong branch and only realise this when it…
Read More

Git commits made directly to branch

Posted by By Paul November 27, 2018Posted inGit, Version ControlNo Comments
Sometimes in Git I'll need to synchronise a long-lived feature branch with master to reduce the likelihood of merge conflicts at a later date. One of the problems with doing…
Read More

Copying a file from another branch in Git

Posted by By Paul January 3, 2018Posted inGitNo Comments
Copying a file from another branch into my current branch is something I do every so often in Git, e.g. when I want to reset a file in staging to…
Read More

Self-hosted Git using SSH

Posted by By Paul May 1, 2017Posted inGit, Version ControlNo Comments
Most of my Git needs are met by GitHub (public) and BitBucket (private), but occasionally I want to hold confidential data on a server which I control. There are self-hosted…
Read More

Training courses under development

Posted by By Paul August 15, 2016Posted inAnsible, Configuration Management, Git, Training, Version ControlNo Comments
About a month ago, I posted about the possibility of charging for training notes. Based on the feedback I received via Twitter, I've decided to make all future training notes…
Read More

Charging for training notes?

Posted by By Paul July 6, 2016Posted inAnsible, Business, Configuration Management, Git, Training, Version ControlNo Comments
Earlier this year I delivered a half-day workshop entitled Configuration Management with Ansible and Git. I spent a lot of time preparing the notes for the workshop, and as a result…
Read More

Configuration management with Ansible and Git slides

Posted by By Paul March 20, 2016Posted inAnsible, Configuration Management, Git, Version ControlNo Comments
Earlier this week I delivered a talk entitled Configuration Management with Ansible and Git at the FLOSS UK Spring conference. I've now uploaded the slides for my talk, which you can view…
Read More

Deleting branches in Git

Posted by By Paul December 16, 2015Posted inGitNo Comments
For some projects, the workflow I use in Git is to create a new branch for every new feature or bug fix. This works well for keeping things separate, but…
Read More

Find Git commits by email address

Posted by By Paul April 15, 2015Posted inGitNo Comments
Often in Git you'll want to find a list of commits from a given author or organisation. Fortunately this is a simple enough task with two arguments to git log: git…
Read More

Shallow cloning with Git

Posted by By Paul March 24, 2014Posted inGit, Version ControlNo Comments
Sometimes when you clone a Git repository, you just want a snapshot of the code without all the history associated with it. This is known as a shallow clone and…
Read More

Posts navigation

1 2 Next page
Contact details
Paul Waring
paul@phpdeveloper.org.uk
07999 030 251
LinkedIn
Recent Posts
  • Disabling HTML form validation
  • Convert UK date to ISO date in JavaScript
  • Automated WordPress updates for Sympl
  • Sorting arrays in Twig
  • Changing Docker container timezones
Copyright 2022 — PHP Developer. All rights reserved. Sinatra WordPress Theme
Scroll to Top