Git trick

A friend asked me about an error he had while trying ‘git pull, it was saying that file X was not uptodate.

For git pull (actually for merge) you need to not have anything uncommited (either commit or reset). But he did not wanted to commit because he didn’t finished working neither reset because he would lose his work.

There is another way, git stash: Git stash saves your modifications away and gives you a clean working dir. Use ‘git stash <optional name>‘ to create a stash. With ‘git stash list‘ you can view your stashes, ‘git stash show <name>‘ to view a specific stash and ‘git stash apply <name>‘ to apply it.

In his case he needed to run:

git stash work
git pull
git apply work

Advertisement

Compiling git with documentation

I have previously posted how to compile git on Ubuntu but while using git I wanted to consulte the manual to get information about some commands and git help didn’t work. It seems that you have to manually specify when compiling that you want to have documentation included too.

Here’s how to do that. Go to the directory where you have unarchived git sources and type:

make doc
sudo make install-doc

You can also combine them when you compile git:

make all doc
sudo make install install-doc

Updating git on ubuntu

Updated with the latest git release 1.5.5.1

I am using Ubuntu 7.10 Gutsy and use git a lot, the latest version in gutsy repository is 1.5.2.5 but the latest version of Git is 1.5.5.1 so here’s a quick tip for compiling git.

First remove git if you have installed it from repositories:
sudo apt-get remove git git-svn

Then go into a temporary folder where you will download and compile git:
wget http://kernel.org/pub/software/scm/git/git-1.5.5.1.tar.bz2
sudo apt-get build-dep git-core
tar xjf git-1.5.5.1.tar.bz2
cd git-1.5.5.1/
./configure
make
sudo make install
If you have a dual core CPU and want to use them both to compile faster use make -j2 instead of make

Now enjoy your hand compiled git 🙂

PS: For git gui I had to to install tk (sudo apt-get install tk).