[plt-dev] Re: [plt] Push #20178: master branch updated

Yeah, sorry, I realized as soon as the "git push" reported 2 commits
that I should have rebased, but by then it was too late.

Carl Eastlund

On Mon, May 10, 2010 at 8:14 PM, Eli Barzilay <eli at barzilay.org> wrote:
> On May 10, Jay McCarthy wrote:
>> I have never typed 'git merge'. I do 'git pull'.
>
> Right, this is all described there.
>
>> You're asking me to type two commands (git fetch, git merge)?
>
> You can do it with a single `git pull --rebase' (also mentioned).
>
>
>> So that there are three less lines in a message that you've already
>> shown you can identify and potentially remove always?
>
> The lines in the message are not the issue -- the issue is having more
> commits there, which in general makes the history more verbose and
> complicated than it needs to be.
>
> --
>          ((lambda (x) (x x)) (lambda (x) (x x)))          Eli Barzilay:
>                    http://barzilay.org/                   Maze is Life!