Barijaona Ramaholimihaso barijaona

Git power tricks

These commands may help when dealing with old and complicated Git repositories. I used them to build a new branch to streamline a more readable history for a 20-year-old project.

Compare two directories at different times of history

git difftool -d <commit-a>:path/to/dir1 <commit-b>:path/to/dir2

Have a quick view of differences

Badass git pull alternative

Add this in your path as git-up and git-reup (symbolic link) and it amps up your git pull by means of git up

Adds in a list of the commits you're pulling down
Auto-prunes remote branches
Defaults to pull --rebase - gets rid of unnecessary merge commits. If you don't know what rebase does, this is probably safe for you. If you know what rebase does, you should know where this will not be safe for you.

Kyle Neath, Ryan Tomayko and then Zach Holman basically figured out how to do this. TheSpyder found a small error on case sensitive file systems.

	# macOS installers can be found at https://support.apple.com/en-us/HT211683
	# for Sierra (macOS 10.12), after running the installer
	# you get "Install macOS Sierra.app" in your Applications folder

	# work around "not a valid volume mount point" issues
	# cf. https://forums.macrumors.com/threads/not-a-valid-volume-mount-point-cant-make-bootable-drive.1935673/page-3?post=28197924#post-28197924
	sudo plutil -replace CFBundleShortVersionString -string "12.6.03" /Applications/Install\ macOS\ Sierra.app/Contents/Info.plist

	# create a DVD-Rom disk image
	hdiutil create -o /tmp/Sierra.cdr -size 5200m -layout SPUD -fs HFS+J

	#!/usr/bin/env perl
	#
	# Send USSD requests
	#
	# Authored by Barijaona Ramaholimihaso
	# https://gist.github.com/barijaona
	# Loosely derived from https://gist.github.com/vshymanskyy/5085138
	#
	use strict;
	use warnings;

	# <subject> (Preferably 50 char or less)(Max 72 char)
	# \|<---- Preferably using up to 50 chars --->\|< - - - - - - - - - >\|


	# (Optional) Explain why this change is being made
	# \|<---- Try To Wrap Each Line to a Maximum Of 72 Characters ----->\|

	# (Optional) Provide links or keys to relevant tickets, articles or other resources
	# Some issue trackers recognize the words close, fix, and resolve followed immediately by the issue number
	# Example: Github issue #23

	#
	# Uncrustify Configuration File for Objective-C
	#

	# Alignment
	# ---------

	## Alignment

	# Align on tabstop