Adil Akhmetov weeebdev

Getting Started with Git SVN

Getting Started with Git SVN
Introduction
Caveats
Local merges

Taken from Zach Holman's "Git and Github Secrets".

Keyboard Shortcuts

t - quickly jump through files (similar to cmd+T in VI or Text Mate)

w - quickly switch branches

s - search

Unfortunately, the Cisco AnyConnect client for Mac conflicts with Pow. And by "conflicts", I mean it causes a grey-screen-of-death kernel panic anytime you connect to the VPN and Pow is installed.

As an alternative, there is OpenConnect, a command-line client for Cisco's AnyConnect SSL VPN.

Here's how to get it set up on Mac OS X:

OpenConnect can be installed via homebrew:
```
 brew update
```

brew install openconnect

1. Clone your fork:

git clone [email protected]:YOUR-USERNAME/YOUR-FORKED-REPO.git

2. Add remote from original repository in your forked repository:

cd into/cloned/fork-repo
git remote add upstream git://github.com/ORIGINAL-DEV-USERNAME/REPO-YOU-FORKED-FROM.git
git fetch upstream

	#
	# CORS header support
	#
	# One way to use this is by placing it into a file called "cors_support"
	# under your Nginx configuration directory and placing the following
	# statement inside your location block(s):
	#
	# include cors_support;
	#
	# As of Nginx 1.7.5, add_header supports an "always" parameter which

	# source : http://code.google.com/p/natvpn/source/browse/trunk/stun_server_list
	# A list of available STUN server.

	stun.l.google.com:19302
	stun1.l.google.com:19302
	stun2.l.google.com:19302
	stun3.l.google.com:19302
	stun4.l.google.com:19302
	stun01.sipphone.com
	stun.ekiga.net