Skip to content

Installation PC environment

Jump to bottom
Damien Buhl edited this page Aug 4, 2014 · 10 revisions

Installation git

Windows

  1. KDiff3 (Difftool for diff, merge)
    -> KDiff3-32bit-Setup_0.9.97.exe, latest version here:
    http://sourceforge.net/projects/kdiff3/files/latest/download?source=files
  2. SourceTree (git-GUI)
    -> SourceTreeSetup_0.9.4.exe, latest version here:
    http://www.sourcetreeapp.com/download/
  3. VS2012 source control integration for git
    -> Microsoft.TeamFoundation.Git.Provider.msi, latest version here:
    http://visualstudiogallery.msdn.microsoft.com/abafc7d6-dcaa-40f4-8a5e-d6724bdb980c
    A better integration in VS2012 for commits etc., it can be seen in the following video:
    http://channel9.msdn.com/posts/GitForVisualStudioTFS

Installation guide

Kdiff3:

  • Uncheck the integration option during the installation procedure:

    install kdiff3 options

  • Let all other options as set by default

SourceTree:

  • Let all options as set by default during the installation procedure.

  • After launching the application, it needs to install some other components.

  • We need Git. The best choice is the embedded version:

    install git embedded

  • We do not need Mercurial:

    do not install mercurial

  • After all downloads and related installation procedures have finished, fill in your user information, check the boxes as shown and press Next:

    sourcetree user information

  • Set “Use PUTTY” (default), press “No” on the next dialog (we do not have an SSH key yet):

    sourcetree use putty

  • Finish the wizard, click skip test to stop the connection test:

    sourcetree finish

  • In SourceTree, the options for the diff- and merge-tool must be set:

    sourcetree options kdiff3

Additional installations for VSS -> git

  1. git (separate, not embedded version)
    -> Git-1.8.0-preview20121022.exe, latest version from here:
    http://code.google.com/p/msysgit/downloads/list
  2. Vss2Git (conversion tool)
    -> Vss2GitSetup-1.0.10.exe, latest version from here:
    http://code.google.com/p/vss2git/downloads/list

Linux

  1. sudo apt-get install git-core git-gui gitk kdiff3 git-flow
  2. Setup your identity :
git config --global user.name "Your Name"
git config --global user.email [email protected]
  1. Setup your access to github :
ssh-keygen -t rsa # Then say yes to everything asked
ssh-add .ssh/id_rsa

Now move on to github with your webbrowser and add your public key ( i.e. .ssh/id_rsa.pub ) to your ssh key setting. Add an ssh key to your account

  1. Append this to your ~/.gitconfig file to get color in the commandline :
[color]
        ui = auto
[color "branch"]
        current = yellow reverse
        local = yellow
        remote = green
[color "diff"]
        meta = yellow bold
        frag = magenta bold
        old = red bold
        new = green bold
[color "status"]
        added = yellow
        changed = green
        untracked = cyan
[alias]
        st = status
        ci = commit
        br = branch
        co = checkout
        df = diff
        lg = log -p
        cor = !sh -c 'git checkout $1 && cat BRANCH_DESCRIPTION' -
Clone this wiki locally