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 (7 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
  • Google rolls out Chrome 37, finally fixes horrible font-renderingGoogle rolls out Chrome 37, finally fixes horrible font-rendering
  • How to use the PHP 5.5 password hashing functionsHow to use the PHP 5.5 password hashing functions
  • Bézier Curves – Under the Hood (4min video)Bézier Curves – Under the Hood (4min video)
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

A collection of beautiful ajax loaders / spinners in pure .svg / CSS

No images used, pure svg/css and scaleable. Bookmark now! Brent Jackson‘s ajax spinner / loader library on the project’s demo

the-php-login-project

How to install php-login-minimal on Ubuntu 12.04 LTS

In this article I’ll show you how to install the minimal version of the php-login.net‘s login script (see the GitHub

How to install/setup latest version of PHPMyAdmin on Ubuntu 12.04 LTS (Precise Pangolin)

As the official installation packages of most linux distributions are usually totally out of date (but that’s pure intention, to

php

12 tools for better PHP quality

Nice selection of 12 tools every PHP developer should bookmark. I totally love how the PHP community becomes some kind

php

appserver.io – A New Way of Magento Enterprise Infrastructure (26min video talk)

Interesting stuff for all Magento people (unfortunatly the audio level is very low): This article was written quite a while

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

phpstorm-8

PHPStorm 8 (early access version) released – for free

JetBrains have just released an Early Access version of the upcoming PHPStorm 8. In case you never worked with PHPStorm

php uk conference

PHP Caching Best Practices by Eli White (video from PHP UK Conference 2014)

The title says it all: PHP Caching best practices. This article was written quite a while ago (8 years), please

mod-rewrite-ubuntu-14-04-lts

Which server OS version to choose ? Some EOL lists of Debian, Ubuntu and CentOS

Moving running projects (especially smaller ones that you’ve made for clients years ago) from an outdated and not-supported linux version

Microsoft enters post-password era with Hello (promo video)

Just a short promotion clip, but definitly interesting: Microsoft announces Hello, the authentication system inside Windows 10, using fingerprints, iris

1/4

Categories

Search

css3-chrome-font
Google rolls out Chrome 37, finally fixes horrible font-rendering
mod-rewrite-ubuntu-14-04-lts
How to install / setup PHP 5.5.x on Ubuntu 12.04 LTS
laracon-2014-eu-amsterdam
Laracon 2013 – Jordi Boggiano: In Depth Composer (47min video)
Bézier Curves – Under the Hood (4min video)
php
How to install PHP 7.0 on Ubuntu 14.04 LTS
mod-rewrite-ubuntu-14-04-lts
How to enable mod_rewrite in Ubuntu 14.04 LTS
php
Is there a JSFiddle for PHP ? Yes !
A collection of beautiful ajax loaders / spinners in pure .svg / CSS
DigitalOcean coupon voucher 50
Only today: $50 coupon for DigitalOcean SSD VPS / hosting
phpstorm 7.0 php
PHPStorm 7 has been released!
Soundcloud’s “VP of Engineering” about using SSDs
modern-php
Creator of Slim framework and “PHP – The right way” writes book: “Modern PHP”, available 2015
php
New GitHub repo: simple php-long-polling for creating real-time apps
Redesigning Windows 8 – fantastic and clever drafts by Jay Machalani
New project: Building a naked PHP skeleton / boilerplate application from scratch

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 All”, you consent to the use of ALL the cookies. However, you may visit "Cookie Settings" to provide a controlled consent.
Cookie SettingsAccept All
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