Merge branch 'install_git_from_source' of /home/git/repositories/gitlab/gitlabhq

doc/install/installation.md

@@ -52,7 +52,7 @@ If you are not familiar with vim please skip this and keep using the default edi
 
 Install the required packages:
 
-    sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl git-core openssh-server redis-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate
+    sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl openssh-server redis-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate
 
 Make sure you have the right version of Python installed.
 
@@ -74,6 +74,33 @@ Make sure you have the right version of Python installed.
     # For reStructuredText markup language support install required package:
     sudo apt-get install -y python-docutils
 
+Make sure you have the right version of Git installed
+
+    # Install Git
+    sudo apt-get install -y git-core
+
+    # Make sure Git is version 1.7.10 or higher, for example 1.7.12 or 1.8.4
+    git --version
+
+Is the system packaged Git too old? Remove it and compile from source.
+
+    # Remove packaged Git
+    sudo apt-get remove git-core
+
+    # Install dependencies
+    sudo apt-get install -y libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev build-essential
+
+    # Download and compile from source
+    cd /tmp
+    curl --progress https://git-core.googlecode.com/files/git-1.8.4.1.tar.gz | tar xz
+    cd git-1.8.4.1/
+    make prefix=/usr/local all
+
+    # Install into /usr/local/bin
+    sudo make prefix=/usr/local install
+
+    # When editing config/gitlab.yml (Step 6), change the git bin_path to /usr/local/bin/git
+
 **Note:** In order to receive mail notifications, make sure to install a
 mail server. By default, Debian is shipped with exim4 whereas Ubuntu
 does not ship with one. The recommended mail server is postfix and you can install it with:
@@ -167,6 +194,8 @@ You can change `6-1-stable` to `master` if you want the *bleeding edge* version,
 
     # Make sure to change "localhost" to the fully-qualified domain name of your
     # host serving GitLab where necessary
+    #
+    # If you installed Git from source, change the git bin_path to /usr/local/bin/git
     sudo -u git -H editor config/gitlab.yml
 
     # Make sure GitLab can write to the log/ and tmp/ directories