Logo
  • PHP
    • HipHop / HHVM
    • Modern PHP
    • PHPStorm
    • LAMP
    • Laravel
    • Composer
    • PDO
  • JavaScript
    • node.js
    • AngularJS
  • CSS
    • SASS
    • “CSS4” (CSS level 4)
  • HTML
  • Git
  • LAMP
  • Vagrant
  • UI / UX
  • Architecture of …
  • Off-Topic
With ♥ from Berlin
December 8, 2014
Chris
Git, Local Development, PHP
4

You made a mess with Git ? Here’s a flowchart guideline on how to fix

PreviousNext

Extremely useful. Originally created by Justin Hileman in the presentation Changing History, or How to Git pretty. You’ll also find a printable .pdf version there. Don’t forget to tip him, especially when his flowchart has saved your life three times this week.

This article was written quite a while ago (8 years), please keep this in mind when using the information written here. Links, code and commands might be outdated or broken.

Random articles

  • A super-simple Vagrant LAMP stack bootstrap (installable with one command)A super-simple Vagrant LAMP stack bootstrap (installable with one command)
  • GitHub introduces revert button / rollback for merged pull requestsGitHub introduces revert button / rollback for merged pull requests
  • GitHub rolls out .PSD diff and viewingGitHub rolls out .PSD diff and viewing
  • GitHub finally introduces repo traffic statsGitHub finally introduces repo traffic stats
  • Get visitor stats for your GitHub repo with BitDeliGet visitor stats for your GitHub repo with BitDeli
  • Ignore .idea folder from git in PHPStormIgnore .idea folder from git in PHPStorm
  • ilovepreloaders – A tumblr collection of preloader animationsilovepreloaders – A tumblr collection of preloader animations
  • Get Github’s code colors in PHPStorm (2014 style)Get Github’s code colors in PHPStorm (2014 style)
  • Profiling PHP Applications by Bastian Hofmann (video from PHP UK Conference 2014)Profiling PHP Applications by Bastian Hofmann (video from PHP UK Conference 2014)
git
Share this

4 Comments

  • Amy David
    January 12, 2021 9:33 am

    great work. This can be done more effectively by using proper flowchart tools I guess.
    https://creately.com/

    Reply
  • Anonymous
    February 10, 2017 8:02 pm

    If you want a READABLE version of this chart, you can go to the website this is actually from:

    http://justinhileman.info/article/git-pretty/

    It also includes a printable PDF.

    Reply
  • Shalin Siriwaradhana
    January 5, 2015 11:57 am

    Good one, nicely drawn. yet it would have been even better if standard flowchart symbols had been used! Thanks for sharing..

    Regards,
    Creately

    Reply

Leave A Comment Cancel reply

[Link] Making a website vertically responsive

Very useful tutorial by Ian Yates: How to make a website VERTICALLY responsive, adapting its content for small heights. Interesting

mod-rewrite-ubuntu-14-04-lts

EOL lists of Ubuntu, Debian and CentOS for your server plannings

Chosing the right server operating system will probably save your life and avoid a lot of stress with your clients.

The architecture of StackOverflow

One of the most interesting talks these weeks, and a rare insight into one of the most active pages on

php

Why Modern PHP is Awesome And How You Can Use It Today (Slides by Matt Stauffer)

This article was written quite a while ago (8 years), please keep this in mind when using the information written

Berlin, prepare for TOA conference (15th – 17th of July)

If you are in Berlin right now (and have 80-300 € to spend and 2-3 days of holidays (or “spontanious

How Snapchat wants to earn money (by establishing vertical videos)

Snapchat is worth 15-19 billion dollars. An insane number, making everybody ask: How the hell is this possible, why has

hiphop php

Vote for “Hack” for HipHop/HHMV support (future style PHP) in PHPStorm 8

“Hack” will come. And “Hack” will change PHP, definitly. In case you never heard of it, have a look into

Joshua Davis – my hero of Flash – in two excellent interviews (audio, video)

Joshua Davis is the reason why I’ve started to code. Seriously. Back in the late 90ies, the internet was a

times-new-roman

The Times talks about Times New Roman (3min video)

A sweet little video, made by The Times, about Times New Roman. No real information here, but nice to look.

-45% (or even 50%) off on DesignWall today

Get 45% off on DesignWall.com with this coupon code: AMTHUNTER45 It’s also possible to get off 50% by taking part

1/4

Categories

Search

laracon-2014-eu-amsterdam
Laracon 2013 – Kapil Verma: Engineering Complex Applications with Laravel 4 (40min video)
All new features of WordPress 3.9 in this 2 minute video
Frontend Ops Conf 2014 – Sarah Goff-Dupont: Git, Continuous Integration and Making It Pretty (31min video)
zend framework 3
First view on Zend Framework 3 by Matthew O’Phinney
php
PHP 5.7 gets refactored core, is 10%-30% faster than PHP 5.5! Wow!
php
How to setup / install PHP 5.6 on Ubuntu 14.04 LTS
Test GZIP compression of your server easily
hiphop php
[Link] How to set up HipHop, Nginx and Laravel in Ubuntu 12.04 LTS (in a Vagrant box)
vagrant
A super-simple Vagrant LAMP stack bootstrap (installable with one command)
shadow dom
A quick video introduction into Shadow-DOM, the game-changing DOM-subtree-technology
php uk conference
Slides & talks from PHP UK Conference 2014
phpstorm 7.0 php
How to debug code on a remote server (or in vagrant box) with PHPStorm
Material Design – How Google designed Android L (7min video)
unreal-4-engine
Tim Sweeney talks about the future of game graphics (and which hardware we need to “clone” reality)
What’s new in PHPStorm 10 (Official promo video)

Tags

apache bash centos composer conference coupon CSS debian fonts framework git GitHub hack HHVM HipHop HTML HTML5 IDE JavaScript JS LAMP laravel linux mod_rewrite MVC MySQL Nginx optimization PHP PHP 5.5 PHP 5.6 phpmyadmin PHPStorm security server SSD Ubuntu UI UX vagrant video virtual machine voucher VPS wordpress
Side-Project: Wordle-Solver:
www.wordle-helper.info

Pages

  • Privacy Policy
 
We use cookies on our website to give you the most relevant experience by remembering your preferences and repeat visits. By clicking “Accept”, you consent to the use of ALL the cookies.
Do not sell my personal information.
Cookie SettingsAccept
Manage consent

Privacy Overview

This website uses cookies to improve your experience while you navigate through the website. Out of these, the cookies that are categorized as necessary are stored on your browser as they are essential for the working of basic functionalities of the website. We also use third-party cookies that help us analyze and understand how you use this website. These cookies will be stored in your browser only with your consent. You also have the option to opt-out of these cookies. But opting out of some of these cookies may affect your browsing experience.
Necessary
Always Enabled
Necessary cookies are absolutely essential for the website to function properly. These cookies ensure basic functionalities and security features of the website, anonymously.
CookieDurationDescription
cookielawinfo-checkbox-analytics11 monthsThis cookie is set by GDPR Cookie Consent plugin. The cookie is used to store the user consent for the cookies in the category "Analytics".
cookielawinfo-checkbox-functional11 monthsThe cookie is set by GDPR cookie consent to record the user consent for the cookies in the category "Functional".
cookielawinfo-checkbox-necessary11 monthsThis cookie is set by GDPR Cookie Consent plugin. The cookies is used to store the user consent for the cookies in the category "Necessary".
cookielawinfo-checkbox-others11 monthsThis cookie is set by GDPR Cookie Consent plugin. The cookie is used to store the user consent for the cookies in the category "Other.
cookielawinfo-checkbox-performance11 monthsThis cookie is set by GDPR Cookie Consent plugin. The cookie is used to store the user consent for the cookies in the category "Performance".
viewed_cookie_policy11 monthsThe cookie is set by the GDPR Cookie Consent plugin and is used to store whether or not user has consented to the use of cookies. It does not store any personal data.
Functional
Functional cookies help to perform certain functionalities like sharing the content of the website on social media platforms, collect feedbacks, and other third-party features.
Performance
Performance cookies are used to understand and analyze the key performance indexes of the website which helps in delivering a better user experience for the visitors.
Analytics
Analytical cookies are used to understand how visitors interact with the website. These cookies help provide information on metrics the number of visitors, bounce rate, traffic source, etc.
Advertisement
Advertisement cookies are used to provide visitors with relevant ads and marketing campaigns. These cookies track visitors across websites and collect information to provide customized ads.
Others
Other uncategorized cookies are those that are being analyzed and have not been classified into a category as yet.
SAVE & ACCEPT