From: Jakub Narebski <jnareb@gmail.com>
Date: Fri, 03 Dec 2010 14:56:24 GMT
Subject: Re: [PATCH] git-pull.txt: Add picture to --rebase option
Message-ID: <m3oc923nyz.fsf@localhost.localdomain>
In-Reply-To: <1291365669-10439-1-git-send-email-jari.aalto@cante.net>

jari.aalto@cante.net writes:

> From: Jari Aalto <jari.aalto@cante.net>
> 
> Illustrate what are the effects of the the option.
> 
> Signed-off-by: Jari Aalto <jari.aalto@cante.net>

> ++
> +The effects of this option are:
> +------------
> +    [initial]
> +    o---o---o---A--B   Your work in commit A and B
> +
> +    [git pull --rebase]
> +    o---o---o---*---*--A--B
> +                |   |
> +                New updates merged in. Your work is rebased
> +                on top of them.
> +------------

Good idea.  Thanks.

-- 
Jakub Narebski
Poland
ShadeHawk on #git