kmorcinek

# The following command works for downloading when using Git for Windows:
# curl -LOf http://gist.githubusercontent.com/kmorcinek/2710267/raw/.gitignore
#
# Download this file using PowerShell v3 under Windows with the following comand:
# Invoke-WebRequest https://gist.githubusercontent.com/kmorcinek/2710267/raw/ -OutFile .gitignore
#
# or wget:
# wget --no-check-certificate http://gist.githubusercontent.com/kmorcinek/2710267/raw/.gitignore

# User-specific files

digitaljhelms

Branching

Quick Legend

Description, Instructions, Notes

Instance	Branch

wumpz

git shortlog -e -s -n

jbenet

a simple git branching model (written in 2013)

This is a very simple git workflow. It (and variants) is in use by many people. I settled on it after using it very effectively at Athena. GitHub does something similar; Zach Holman mentioned it in this talk.

Update: Woah, thanks for all the attention. Didn't expect this simple rant to get popular.

peterhurford

So this is a guide for how to use XAMPP to test any PHP website on your own computer. Well, actually, it's more a guide of guides than an actual guide. I personally didn't find the process to be bad, but it also wasn't straightforward, and it involved a lot of googling separate problems. There was no One Guide for the Entire Process, but a bunch of separate things.

So I decided to put everything together. Here are the steps:

Step 1: Install XAMPP. Download from here.

Step 2: Set up XAMPP. Follow instructions here.

Step 3: Go to PhpMyAdmin and create any relevant MySQL tables, if any.

mandiwise

// Reference: http://stackoverflow.com/questions/4822471/count-number-of-lines-in-a-git-repository

$ git ls-files | xargs wc -l

joepie91

Don't use VPN services.

No, seriously, don't. You're probably reading this because you've asked what VPN service to use, and this is the answer.

Note: The content in this post does not apply to using VPN for their intended purpose; that is, as a virtual private (internal) network. It only applies to using it as a glorified proxy, which is what every third-party "VPN provider" does.

• A Russian translation of this article can be found here, contributed by Timur Demin.
• A Turkish translation can be found here, contributed by agyild.
• There's also this article about VPN services, which is honestly better written (and has more cat pictures!) than my article.

odan

Installing Xdebug for XAMPP with PHP 7.x

• New: XAMPP - XDebug Setup for PHP 8

Requirements

• XAMPP for Windows: https://www.apachefriends.org/download.html
• Microsoft Visual C++ Redistributable for Visual Studio 2015, 2017 and 2019

Setup

wizioo

How to have specific .gitignore for each git branch

Objective

My objective is to have some production files ignored on specific branches. Git doesn't allow to do it.

Solution

My solution is to make a general .gitignore file and add .gitignore.branch_name files for the branches I want to add specific file exclusion. I'll use post-checkout hook to copy those .gitignore.branch_name in place of .git/info/exclude each time I go to the branch with git checkout branch_name.

jpolete

Git Branching Strategy

Quick Legend

Branch	Name	Notes
Stable	main	Accepts merges from Release and Hotfix branches only.
Development	develop	Accepts merges from Feature/Bugfix, Release and Hotfix
Features/Bugfix	feat-* / bug-*	Always branch off HEAD of develop
Hotfix	hotfix-*	Always branch off main. Merges back into main and develop.