Git General Prerequisites

1. Install Git

• git-scm.com/download

2. Introduce yourself:

    git config --global user.name "Your Name Comes Here"
    git config --global user.email [email protected]
   

3. Set up Editor. Pick your favorite:

• OS X:

  git config --global --add core.editor "open -W -e -n"

• Windows:

  git config --global core.editor "'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin"

    or
  

  git config --global core.editor "'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin"

• Generic:

   `git config --global core.editor 'vim'`
  
    or
  
   `git config --global core.editor emacs`
  

4. Set up diff and merge tools:

    git config --global diff.tool winmerge
    git config --global difftool.prompt false
    git config --global difftool.winmerge.cmd "WinMergeU.exe -r -u -e -dl Local -dr Remote \"$LOCAL\" \"$REMOTE\""
   
    git config --global merge.tool kdiff3
    git config --global mergetool.kdiff3.cmd "kdiff3 $BASE $LOCAL $REMOTE -o $MERGED"
   
    git config --global merge.tool winmerge
    git config --global mergetool.prompt false
    git config --global mergetool.winmerge.trustExitCode true
    git config --global mergetool.winmerge.cmd "WinMergeU.exe -r -u -e -dl Local -dr Remote \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
   

5. Color Options:

    git config --global color.diff auto
    git config --global color.status auto
    git config --global color.branch auto
   

---

References

• Git Use Cases