Git: Distributed version control

  • gitref.org: Documentation
  • Git Tower: GUI for Mac
  • GitHub: Free online hosting of public repositories
  • Git Flow: An example source control workflow with Git
  • Bananajour: Local GitHub-like hosting of repositories via Bonjour

.gitconfig Notes

Full .gitconfig man page

  • Always ignore .DS_STORE files. www
    git config --global core.excludesfile ~/.gitignore
    echo .DS_Store >> ~/.gitignore
  • Change default editor to TextMate. www
    git config --global core.editor "mate --wait"
  • Color output at the command line. www
    git config --global color.ui true
  • Setup DeltaWalker as default diff/merge tool. Added to ~/.gitconfig manually:
    [difftool "dw"]
    	cmd = "/Applications/DeltaWalker.app/Contents/MacOS/git-diff" "$LOCAL" "$REMOTE"
    [difftool]
    	prompt = false
    [diff]
    	tool = dw
    [mergetool "dw"]
    	cmd = "/Applications/DeltaWalker.app/Contents/MacOS/bzr-git-merge" "$LOCAL" "$REMOTE" "$BASE" "$MERGED" 
    [merge]
    	tool = dw
  • Add Kaleidoscope as another diff tool (nice for diffs but doesn't do merge). Choose Kaleidoscope → Integration… and install command line tools. Then add this to ~/.gitconfig:
    [difftool "ks"]
    	cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"

    Then do $ git difftool -t ks <file>.

computing/git.txt · Last modified: 2011/04/22 3:44 pm PDT by John Colby
 
Except where otherwise noted, content on this wiki is licensed under the following license: CC Attribution-Noncommercial-Share Alike 4.0 International
Recent changes RSS feed Donate Powered by PHP Valid XHTML 1.0 Valid CSS Driven by DokuWiki