History of changes to
‘Rebase is base’

2025-09-02





> 2025-04-17: Add rights to post and notes, see 61ee3af

diff --git a/post/rebase-is-base.md b/post/rebase-is-base.md
index 9dc3270..948fd03 100644
--- a/post/rebase-is-base.md
+++ b/post/rebase-is-base.md
@@ -4,6 +4,7 @@ date: 2023-07-04
 lang: en
 description: "Rebase is base"
 keywords: git
+rights: CC BY-NC-SA 4.0 Jiri Vlasak
 ---
 
 This is a translation of [Git pro mě/Rebase je základ][rjz].




> 2025-04-04: Emphasize diff code in rebase is base

diff --git a/post/rebase-is-base.md b/post/rebase-is-base.md
index 6a24ece..9dc3270 100644
--- a/post/rebase-is-base.md
+++ b/post/rebase-is-base.md
@@ -122,7 +122,7 @@ Changes to be committed:
         new file:   README
 ```
 
-```
+``` diff
 $ git diff --cached
 diff --git a/LICENSE b/LICENSE
 new file mode 100644
@@ -902,7 +902,7 @@ Changes to be committed:
 $ git diff
 ```
 
-```
+``` diff
 $ git diff --cached
 diff --git a/tests/test_operators.py b/tests/test_operators.py
 index 9699439..b57f0f3 100644
@@ -952,7 +952,7 @@ $ git logg
 
 I implement the operator `"*"`.
 
-```
+``` diff
 $ git diff
 diff --git a/args/evaluator.py b/args/evaluator.py
 index 13c2609..d964dca 100644
@@ -1162,7 +1162,7 @@ By the way, the current state of the repository, particularly the
 `test_operators.py` file, nicely shows the difference between the changes ready
 to be committed (to the history) and those that are not ready.
 
-```
+``` diff
 $ git diff
 diff --git a/tests/test_operators.py b/tests/test_operators.py
 index a01cdb0..5dfc209 100644
@@ -1176,7 +1176,7 @@ index a01cdb0..5dfc209 100644
          assert 6 == ev("*", 1, 2, 3)
 ```
 
-```
+``` diff
 $ git diff --cached
 diff --git a/tests/test_operators.py b/tests/test_operators.py
 index b57f0f3..a01cdb0 100644
@@ -1227,7 +1227,7 @@ present in the history.
 $ git add tests/test_operators.py
 ```
 
-```
+``` diff
 $ git diff --cached
 diff --git a/tests/test_operators.py b/tests/test_operators.py
 index a01cdb0..5dfc209 100644
@@ -1706,7 +1706,7 @@ $ git logg
 * d0dbc16 Add license, readme
 ```
 
-```
+``` diff
 $ git diff
 diff --git a/tests/test_operators.py b/tests/test_operators.py
 index 5dfc209..0056ab1 100644
@@ -1775,7 +1775,7 @@ $ git checkout master
 Switched to branch 'master'
 ```
 
-```
+``` diff
 $ git diff
 diff --git a/README b/README
 index 4e3d26f..470c1a1 100644
@@ -1841,7 +1841,7 @@ $ git logg
 * d0dbc16 Add license, readme
 ```
 
-```
+``` diff
 $ git diff
 diff --git a/args/evaluator.py b/args/evaluator.py
 index d964dca..1397bec 100644
@@ -1938,7 +1938,7 @@ $ git logg
 * d0dbc16 Add license, readme
 ```
 
-```
+``` diff
 $ git diff
 diff --git a/args/evaluator.py b/args/evaluator.py
 index d964dca..adfe8e2 100644
@@ -2003,7 +2003,7 @@ index 5dfc209..4c75980 100644
 (1/1) Stage this hunk [y,n,q,a,d,e,?]? y
 ```
 
-```
+``` diff
 $ git diff --cached
 diff --git a/tests/test_operators.py b/tests/test_operators.py
 index 5dfc209..4c75980 100644
@@ -2027,7 +2027,7 @@ $ git commit -m'Add operator ">" unit test'
  1 file changed, 6 insertions(+)
 ```
 
-```
+``` diff
 $ git diff
 diff --git a/args/evaluator.py b/args/evaluator.py
 index d964dca..adfe8e2 100644
@@ -2136,7 +2136,7 @@ Unmerged paths:
 no changes added to commit (use "git add" and/or "git commit -a")
 ```
 
-```
+``` diff
 $ git diff
 diff --cc args/evaluator.py
 index 1397bec,adfe8e2..0000000
@@ -2195,7 +2195,7 @@ Unmerged paths:
 no changes added to commit (use "git add" and/or "git commit -a")
 ```
 
-```
+``` diff
 $ git diff
 diff --cc args/evaluator.py
 index 1397bec,adfe8e2..0000000
@@ -2275,7 +2275,7 @@ Changes to be committed:
         modified:   tests/test_operators.py
 ```
 
-```
+``` diff
 $ git diff --cached
 diff --git a/args/evaluator.py b/args/evaluator.py
 index d964dca..b00bfab 100644




> 2025-04-04: Fix links to rebase is base sections

diff --git a/post/rebase-is-base.md b/post/rebase-is-base.md
index ca7ab3c..6a24ece 100644
--- a/post/rebase-is-base.md
+++ b/post/rebase-is-base.md
@@ -43,9 +43,9 @@ Table of content:
 
 - [Repository initialization](#repository-initialization)
 - [Add license, readme](#add-license-readme)
-- [Add operator "+"](#add-operator-)
-- [Add operator "*"](#add-operator--1)
-- [Add docstrings for "+" and "*" unit tests](#add-docstrings-for--and--unit-tests)
+- [Add operator "+"](#add-operator)
+- [Add operator "*"](#add-operator-1)
+- [Add docstrings for "+" and "*" unit tests](#add-docstrings-for-and-unit-tests)
 - [Alternative history](#alternative-history)
 - [Conflicting history](#conflicting-history)
 - [Commands used](#commands-used)




> 2025-04-04: Add keywords

diff --git a/post/rebase-is-base.md b/post/rebase-is-base.md
index fc69b92..ca7ab3c 100644
--- a/post/rebase-is-base.md
+++ b/post/rebase-is-base.md
@@ -3,6 +3,7 @@ title: "Rebase is base"
 date: 2023-07-04
 lang: en
 description: "Rebase is base"
+keywords: git
 ---
 
 This is a translation of [Git pro mě/Rebase je základ][rjz].




> 2025-04-04: Add lang and description to posts and notes

diff --git a/post/rebase-is-base.md b/post/rebase-is-base.md
index 8f7f63c..fc69b92 100644
--- a/post/rebase-is-base.md
+++ b/post/rebase-is-base.md
@@ -1,6 +1,8 @@
 ---
 title: "Rebase is base"
 date: 2023-07-04
+lang: en
+description: "Rebase is base"
 ---
 
 This is a translation of [Git pro mě/Rebase je základ][rjz].




> 2025-02-20: Move long notes to posts

diff --git a/note/rebase-is-base.md b/post/rebase-is-base.md
similarity index 100%
rename from note/rebase-is-base.md
rename to post/rebase-is-base.md




> 2024-12-20: Add title to add script, use date only in date

diff --git a/note/rebase-is-base.md b/note/rebase-is-base.md
index da38c22..8f7f63c 100644
--- a/note/rebase-is-base.md
+++ b/note/rebase-is-base.md
@@ -1,6 +1,6 @@
 ---
 title: "Rebase is base"
-date: 2023-07-04T18:50:01+02:00
+date: 2023-07-04
 ---
 
 This is a translation of [Git pro mě/Rebase je základ][rjz].




> 2024-10-04: Add config enforcing LF in rebase is base talk

diff --git a/note/rebase-is-base.md b/note/rebase-is-base.md
index 0e4e182..da38c22 100644
--- a/note/rebase-is-base.md
+++ b/note/rebase-is-base.md
@@ -186,6 +186,21 @@ Vim can be closed by `ZZ` (means "shift" and "z" twice). The default editor can
 git config --global core.editor 'vim'
 ```
 
+It's possible to use another editor:
+
+```
+git config --global core.editor 'gedit'
+git config --global core.editor 'notepad'
+```
+
+When working on Windows, it's better to enforce the same line endings the git
+uses:
+
+```
+git config core.autocrlf false
+git config core.eol lf
+```
+
 The short message is called *commit message*. It may have multiple lines where
 the first line starts with capital letter, it is at most 52 characters long,
 does not ending with a dot, and it is the imperative continuation of the "When




> 2024-07-29: Fix toc

diff --git a/note/rebase-is-base.md b/note/rebase-is-base.md
index 699e21b..0e4e182 100644
--- a/note/rebase-is-base.md
+++ b/note/rebase-is-base.md
@@ -37,6 +37,7 @@ commands are written to the command line prompt in the `args` directory
 
 
 Table of content:
+
 - [Repository initialization](#repository-initialization)
 - [Add license, readme](#add-license-readme)
 - [Add operator "+"](#add-operator-)




> 2024-07-29: Move notes

diff --git a/hugo/content/notes/rebase-is-base.md b/note/rebase-is-base.md
similarity index 100%
rename from hugo/content/notes/rebase-is-base.md
rename to note/rebase-is-base.md
go back see post