Richard Torres richardtorres314

Inspired by dannyfritz/commit-message-emoji

Squashing Git Commits

The easy and flexible way

This method avoids merge conflicts if you have periodically pulled master into your branch. It also gives you the opportunity to squash into more than 1 commit, or to re-arrange your code into completely different commits (e.g. if you ended up working on three different features but the commits were not consecutive).

Note: You cannot use this method if you intend to open a pull request to merge your feature branch. This method requires committing directly to master.

Switch to the master branch and make sure you are up to date:

Firing up LaTex on macOS 🔥

As I'm writing this small tutorial, I assume you've read my previous one about setting up macOS, so if for any tool I'll use without explanation, look to that other article.

MacTex

The full version IS NOT MANDATORY, as in the tutorial that follows I installed the smaller version of MacTeX and proceded installing every needed dependency. Installing the complete package is about ~3.5GB of download and ~5GB on disk, the smaller one is just about 80MBs.

Click here to download the complete version or here to download the smaller version.

Gnuplot

Connect & use Logitech F310 with Macbook

Since my Macbook Pro only has USB-C port, I used an USB-A to USB-C adapter to connect my F310 to it, but it does not work (pressing MODE button does not turn on the LED).

How to

To make it work:

Disconnect F310 from Mac
On F310: switch X-input to D-input
Hold Logitech button (in the middle)
Connect F310 to Mac via adapter, now you can release the Logitech button.

In your local clone of your forked repository, you can add the original GitHub repository as a "remote". ("Remotes" are like nicknames for the URLs of repositories - origin is one, for example.) Then you can fetch all the branches from that upstream repository, and rebase your work to continue working on the upstream version. In terms of commands that might look like:

Add the remote, call it "upstream":

git remote add upstream https://github.com/whoever/whatever.git

Fetch all the branches of that remote into remote-tracking branches, such as upstream/master:

git fetch upstream

	Laravel 5 - Deploy to Heroku
	Martin Cruz Otiniano

	> composer create-project laravel/laravel my_name_app
	> cd my_name_app

	> git init
	> git add -A
	> git commit -m "Initial commit"

	// --------------------------------------------------
	// Flexbox SASS mixins
	// The spec: http://www.w3.org/TR/css3-flexbox
	// --------------------------------------------------

	// Flexbox display
	@mixin flexbox {
	display: -webkit-box;
	display: -moz-box;
	display: -ms-flexbox;

Commit type	Emoji
Initial commit	🎉 `:tada:`
Version tag	🔖 `:bookmark:`
New feature	✨ `:sparkles:`
Bugfix	🐛 `:bug:`

	{
	"workbench.colorCustomizations": {
	"terminal.foreground": "#839496",
	"terminal.background": "#002833",
	"terminal.ansiBlack": "#003541",
	"terminal.ansiBlue": "#268bd2",
	"terminal.ansiCyan": "#2aa198",
	"terminal.ansiGreen": "#859901",
	"terminal.ansiMagenta": "#d33682",
	"terminal.ansiRed": "#dc322f",

	var https = require('https');
	var util = require('util');

	exports.handler = function(event, context) {
	console.log(JSON.stringify(event, null, 2));
	console.log('From SNS:', event.Records[0].Sns.Message);

	var postData = {
	"channel": "#aws-sns",
	"username": "AWS SNS via Lamda :: DevQa Cloud",

	git branch -m old_branch new_branch # Rename branch locally
	git push origin :old_branch # Delete the old branch
	git push --set-upstream origin new_branch # Push the new branch, set local branch to track the new remote