[PATCH] git-pull.txt: Add picture to --rebase option
From: <hidden>
Date: 2016-06-15 22:50:09
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
From: Jari Aalto <redacted> Illustrate what are the effects of the the option. Signed-off-by: Jari Aalto <redacted> --- 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