summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAki <please@ignore.pl>2022-01-28 17:43:57 +0100
committerAki <please@ignore.pl>2022-01-28 17:43:57 +0100
commit91a4f7de155e97cb1b804323dbc5cf6383ec029c (patch)
tree775bcafe2f5d2ea22374bf98804aa265512606b2
parente7f5a69951e22cc8cdf8ab51fe019b45d94c76ca (diff)
downloadignore.pl-91a4f7de155e97cb1b804323dbc5cf6383ec029c.zip
ignore.pl-91a4f7de155e97cb1b804323dbc5cf6383ec029c.tar.gz
ignore.pl-91a4f7de155e97cb1b804323dbc5cf6383ec029c.tar.bz2
Changed ending of time travel story
-rw-r--r--git_rebase_illustrated_with_time_travel.html10
1 files changed, 5 insertions, 5 deletions
diff --git a/git_rebase_illustrated_with_time_travel.html b/git_rebase_illustrated_with_time_travel.html
index ebfc19f..ca460e0 100644
--- a/git_rebase_illustrated_with_time_travel.html
+++ b/git_rebase_illustrated_with_time_travel.html
@@ -47,10 +47,10 @@ merged, so there's no need to do anything. And they spoke truthfully, because in
<p>But from the perspective of the traveller the whole timeline got distorted and didn't look linear at all:</p>
<img src="git_rebase_illustrated_with_time_travel-5.png" alt="rebase in non-linear timeline">
<p>From this point of view the sequence is one-lane and completely undisturbed. On the other time the timeline gets
-shifted and some parts of it fade away as they never were or are no longer observed by the time traveller.
-<p>All of this happens every time you rebase your branches.
-<p>I hope you had fun and if you actually had some problems imagining what rebase does, I hope this post at least
-pointed you in the right direction.
-<p>Who knows maybe next time I'll write about more history rewriting shenanigans.
+shifted and some parts of it fade away as they never were or are no longer observed by the time traveller. This is the
+perspective that one assumes when explaining rebase "in a normal way": reapplying the changes to a different base code
+(with same dates, meaning time travel, yay).
+<p>All of this happens every time you rebase your branches. Really.
+<p>Don't get me to talk started about interactive rebase features and cherry-picking! Or maybe do. That could be fun.
</article>
<script src="https://stats.ignore.pl/track.js"></script>