From 91a4f7de155e97cb1b804323dbc5cf6383ec029c Mon Sep 17 00:00:00 2001 From: Aki Date: Fri, 28 Jan 2022 17:43:57 +0100 Subject: Changed ending of time travel story --- git_rebase_illustrated_with_time_travel.html | 10 +++++----- 1 file 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

But from the perspective of the traveller the whole timeline got distorted and didn't look linear at all:

rebase in non-linear timeline

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. -

All of this happens every time you rebase your branches. -

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. -

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). +

All of this happens every time you rebase your branches. Really. +

Don't get me to talk started about interactive rebase features and cherry-picking! Or maybe do. That could be fun. -- cgit v1.1