[ic] [interchange: 2/2] Merge branch 'master' of ssh://git.icdevgroup.org/var/git/interchange

[Jon Jensen]

On Fri, 12 Jul 2013, Mike Heins wrote:

> What's this? Hope I didn't mess anything up. All I did was a git 
> pull....I am no git guru, by any manner or means, but I thought that was 
> safe.

Generally you ought to do `git pull --rebase` instead of a plain git pull 
that defaults to merging. The rebase relayers your commit(s) on top of 
whatever else is already in the repo and avoids that extra ugly merge 
commit that is usually unhelpful.

Jon