Git combine (merge) local commits into one

This tutorial is for those of you who used ToirtoiseGit which has the option of combining local commits before pushing them to the remote source and want to use that option in other Git clients.

To combine (merge) local commits into one before pushing them:

1. Switch to your local branch where your commits reside (actually it does NOT have to be a different branch, you can combine git commits on your local master as well)

2. I suppose you have already made 3 commits which you want to combine (merge) into one.

3. Reset (soft) as many commits down as you want to combine in your branch. When you execute a soft reset on a branch you end up having the combined result of the commits in your index ready to commit.

4. Commit the changes from your index - you end up having a single commit which a combined (merged) result of the previous three.

Screenshots were done using "SmartGit" from syntevo.

git://eagain.net/gitosis.git not found (setting up gitosis on ubuntu)

Following a tutorial on: http://blog.agdunn.net/?p=277
I found that eagain.net does not work for me. Alternatively you can clone gitosis from:

git clone https://github.com/tv42/gitosis.git

or download it from here.

Ubuntu Server 12.04 xrdp failed to load session 'ubuntu'

This error is caused by xrdp trying to run the classic Ubuntu desktop when it is not installed. This can happen when you install Ubuntu server without graphical environment and then install gnome-classic desktop only.

There are 2 files you need to worry about:

/etc/xrdp/startwm.sh

which should have:
. /etc/X11/Xsession
at the end.
(there is a space between '.' and '/etc')

and ~/.xsession 
(Don't worry if there isn't – it just means you haven't created it yet)
This file should have:
gnome-session --session=gnome-classic

restart xrdp with:
/etc/init.d/xrdp restart


Connect with
"sesman-Xvnc"
settings.