From: Jakub Narebski <jnareb@gmail.com>
To: Jari Aalto <jari.aalto@cante.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-pull.txt: Add picture to --rebase option
Date: Fri, 03 Dec 2010 06:56:24 -0800 (PST) [thread overview]
Message-ID: <m3oc923nyz.fsf@localhost.localdomain> (raw)
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
next prev parent reply other threads:[~2010-12-03 14:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-03 8:41 [PATCH] git-pull.txt: Add picture to --rebase option jari.aalto
2010-12-03 14:56 ` Jakub Narebski [this message]
2010-12-03 19:35 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3oc923nyz.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=jari.aalto@cante.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).