Timoteo Ponce timoteoponce

Using DiffMerge as your git mergetool (for Mac OS X / macOS)

Reference(s):

Step 1: download and install the DiffMerge OS X Installer

http://www.sourcegear.com/diffmerge/downloads.php - get the installer version, NOT the dmg version

vimdiff cheat sheet

##git mergetool

In the middle file (future merged file), you can navigate between conflicts with ]c and [c.

Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).

:diffupdate (to remove leftover spacing issues)

:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)

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

	# Base settings and GC logging
	-server -XX:+AlwaysPreTouch # First should be default, but we make it explicit, second pre-zeroes memory mapped pages on JVM startup -- improves runtime performance
	# -Xloggc:gc-%t.log # CUSTOMIZE LOCATION HERE - $path/gc-%t.log -- the %t in the gc log file path is so we get a new file with each JVM restart
	-XX:NumberOfGCLogFiles=5 -XX:+UseGCLogFileRotation -XX:GCLogFileSize=20m # Limits the number of files, logs to folder
	-XX:+PrintGC -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintHeapAtGC -XX:+PrintGCCause
	-XX:+PrintTenuringDistribution -XX:+PrintReferenceGC -XX:+PrintAdaptiveSizePolicy # gather info on object age & reference GC time for further tuning if needed.

	# G1 specific settings -- probably should be default for multi-core systems with >2 GB of heap (below that, default is probably fine)
	-XX:+UseG1GC
	-XX:+UseStringDeduplication

	var EventSystem = (function() {
	var self = this;

	self.queue = {};

	return {
	publish: function (event, data) {
	var queue = self.queue[event];

	if (typeof queue === 'undefined') {

	# Redirect to a different page when a PHP file is uploaded
	SecRule FILES "(?i)\.php$" "t:none,log,redirect:http://cyberis.co.uk,msg:'PHP file upload blocked',id:1"

	# Deny when a semi-colon is found in the 'ip' parameter
	SecRule ARGS:ip ";" "t:none,log,deny,msg:'semi colon test',id:2"


	# Disable ModSecurity for a given page - NOTE THE ESCAPE OF THE '?'
	SecRule REQUEST_URI "/joomla/index.php/component/users/\?task=registration.register" "allow,id:3"

	/*

	github.com style (c) Vasily Polovnyov <[email protected]>

	*/

	.hljs {
	display: block; padding: 0.5em;
	color: #333;
	background: #f8f8f8

	brew install coreutils
	sudo ln -s /usr/local/bin/gtimeout /usr/local/bin/timeout