dpbackes

Using Git Command Line for Feature Dev

Here's an example of what I do with git on the command line during the course of developing a feature. At the start I am on the main branch with no local modifications

First, create a named branch for the feature

git checkout -b MyFeature

Then, I begin to write the feature. As I'm going, I'll make commits to save state in case I want to go back.

dpbackes

    internal sealed class StateTransitionPoolFactory<TState, TObject>
    {
        private readonly Dictionary<Tuple<TState, TState>, Action<TObject>> transitions = new Dictionary<Tuple<TState, TState>, Action<TObject>>();
        private readonly List<TState> toStates = new List<TState>();

        private TState fromState;
        private bool fromDefined;
        private bool readyForNewInitialState = true;

        public StateTransitionPoolFactory<TState, TObject> From(TState state)

dpbackes

var func = function() {
  var list = {};
  $(".selected").each(function(){
    list[$(this).parent().parent().attr('class').replace(/.*story_(\d+).*/,"$1")] = $(this).parent().parent().find('.story_name').text();
  });
  var result = Object.keys(list).map(key => "[Delivers #" + key + "] " + list[key]).join("<br>");

  window.open("data:text/html,"+result);
};
func()

dpbackes

function Review-PullRequest {
    param(
        [Parameter(Mandatory=$false)]
        [string]$Number
    )

    Invoke-Expression "git fetch origin"
    Invoke-Expression "git fetch origin refs/pull/$Number/head --"

    $commits = Invoke-Expression "git rev-list origin/master..FETCH_HEAD --"

dpbackes

git branch --merged master |  ? { $_ -notmatch '(^\*)|(^. master$)' } | % { git branch -d $_.Substring(2) }

dpbackes

(Get-ChildItem -Recurse -Filter *.csproj | Where-Object { Select-String '(\.\.\\)+[cC]ommon' $_ -Quiet }) | Foreach-Object {$file = $_.FullName; (Get-Content $_.FullName) | Foreach-Object {$_ -replace '(\.\.\\)+[Cc]ommon', '$(SolutionDir)\Common'} | Set-Content $file}

dpbackes

GENERATED_FILES = \
	wi.json

all: $(GENERATED_FILES)

.PHONY: clean all

clean:
	rm -rf -- $(GENERATED_FILES) build

dpbackes

GENERATED_FILES = \
	wi.json

all: $(GENERATED_FILES)

.PHONY: clean all

clean:
	rm -rf -- $(GENERATED_FILES) build

dpbackes

/*
  Runs the mege sort algorithm on the passed in list using the specified compare function
  
	The compare function should take two parameters. It should return -1 if the first parameter
	is less than the second parameter, 0 if they are equal, and 1 if the second parameter is 
	less than the first
 
  see http://en.wikipedia.org/wiki/Merge_sort for more detail
*/
function MergeSort(list, compareFunc)

dpbackes

var o="  ";for(var i=0;i<10;i++){o+=i+" "}o+='\n';for(var i=0;i<10;i++){o+=i+" ";for(var j=0;j<10;j++){o+=i*j+" "}o+="\n"}console.log(o);