- git bisect   
    - to find when a bug/functionality is introduced 
    - I believe we already decided there isn't an analogy
- git reset 
    - 1) i've made several commits(changesets) on my local branch. now I want to create a branch at this point (to keep my work for later) and reset my local branch to match the remote branch to get some other work done (collaborate with a teammate) 
        (on branch: featureA) 
        git checkout -b new_featureA 
        git reset --hard origin/featureA 
    - 2) i've completed merging two branches, and committed the merge. now i realize that the merge was not correct, so I want to re-do it and get it right 
        (on branch: master) 
        git merge featureA 
        (resolve conflicts, commit changes, realize that I messed up) 
        git reset --hard HEAD~1 
        (start merge again) 
- create a new branch from any existing commit 
  - I want to branch off of an existing commit, which isn't a commit at the head of a branch, and there isn't a tag pointing to it either 
    git checkout af89a08e0 
    git checkout -b featureB 
- create shell scripts to interact with SCM 
  - I want to run a script which fixes certain common merge conflicts then stages changed files for committing 
  - git commands used: 
        git status: lists each file and shows which files have unmerged conflicts 
        git add: stage files in the index so they are ready to be committed 
- rebase/squash commits - git rebase 
  - often i create multiple small temporary commits locally which I later squash into a single commit before pushing remotely 
- git pickaxe - git log -SsearchString 
  - find commits in the log where "searchString" was added or removed 
- show branch activity 
  - show all branches, who was the last person to commit, and when the commit was 
  - git for-each-ref --sort=-committerdate refs/heads/ --format='%(refname:short) %(committerdate:short) %(authorname)' 

I am going to dig deeper into this tomorrow, but I just wanted to get this out there in case others have already looked into one or more of these.

Cheers

Adrian