From: jari.aalto@cante.net
To: git@vger.kernel.org
Cc: Jari Aalto <jari.aalto@cante.net>
Subject: [PATCH] git-pull.txt: Add picture to --rebase option
Date: Fri, 3 Dec 2010 10:41:09 +0200 [thread overview]
Message-ID: <1291365669-10439-1-git-send-email-jari.aalto@cante.net> (raw)
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>
---
Documentation/git-pull.txt | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index e47361f..25eb6de 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -106,6 +106,18 @@ This is a potentially _dangerous_ mode of operation.
It rewrites history, which does not bode well when you
published that history already. Do *not* use this option
unless you have read linkgit:git-rebase[1] carefully.
++
+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.
+------------
--no-rebase::
Override earlier --rebase.
--
1.7.2.3
next reply other threads:[~2010-12-03 8:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-03 8:41 jari.aalto [this message]
2010-12-03 14:56 ` [PATCH] git-pull.txt: Add picture to --rebase option Jakub Narebski
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=1291365669-10439-1-git-send-email-jari.aalto@cante.net \
--to=jari.aalto@cante.net \
--cc=git@vger.kernel.org \
/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).