David Gowrie dgowrie

Git-workflow vs feature branching

When working with Git, there are two prevailing workflows are Git workflow and feature branches. IMHO, being more of a subscriber to continuous integration, I feel that the feature branch workflow is better suited, and the focus of this article.

If you are new to Git and Git-workflows, I suggest reading the atlassian.com Git Workflow article in addition to this as there is more detail there than presented here.

I admit, using Bash in the command line with the standard configuration leaves a bit to be desired when it comes to awareness of state. A tool that I suggest using follows these instructions on setting up GIT Bash autocompletion. This tool will assist you to better visualize the state of a branc

This list has been superseded by Public APIs. Check there for APIs with Auth: No, HTTPS and CORS Yes.

List of data APIs that require no server-side auth or private credentials, and are thus good for small browser-only JS projects.

3taps (information)
Adobe Creative SDK (image editing)
App.net
Bing Maps

Multiple SSH Keys settings for different github account

create different public key

create different ssh key according the article Mac Set-Up Git

$ ssh-keygen -t rsa -C "[email protected]"

NOTE I now use the conventions detailed in the SUIT framework

Template Components

Used to provide structural templates.

Pattern

t-template-name

	# -----------------------------------------------------------------
	# .gitignore for WordPress
	# Bare Minimum Git
	# http://ironco.de/bare-minimum-git/
	# ver 20150227
	#
	# This file is tailored for a WordPress project
	# using the default directory structure
	#
	# This file specifies intentionally untracked files to ignore

	[
	{
	"keys": ["ctrl+2"],
	"command": "run_macro_file",
	"args": {
	"file": "Packages/User/to-2.sublime-macro"
	}
	},
	{
	"keys": ["ctrl+4"],

	#!/usr/bin/env bash
	# MIT © Sindre Sorhus - sindresorhus.com

	# git hook to run a command after `git pull` if a specified file was changed
	# Run `chmod +x post-merge` to make it executable then put it into `.git/hooks/`.

	changed_files="$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)"

	check_run() {
	echo "$changed_files" \| grep --quiet "$1" && eval "$2"