Versioning commits and patches with git-series
Transcript of Versioning commits and patches with git-series
![Page 1: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/1.jpg)
Versions all the way downVersioning commits and patches with git-series
Josh [email protected]
LinuxCon North America 2016
![Page 2: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/2.jpg)
![Page 3: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/3.jpg)
RFC: feature
![Page 4: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/4.jpg)
RFC: feature
![Page 5: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/5.jpg)
Development
![Page 6: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/6.jpg)
git commit
![Page 7: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/7.jpg)
git format-patch -3
[PATCH 1/3] Cleanup and yak shaving
[PATCH 2/3] Implement feature
[PATCH 3/3] Use feature
![Page 8: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/8.jpg)
git format-patch -3
[PATCH 1/3] Cleanup and yak shaving
[PATCH 2/3] Implement feature
[PATCH 3/3] Use feature
![Page 9: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/9.jpg)
git request-pull ...
git hub pull new ...
![Page 10: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/10.jpg)
git request-pull ...
git hub pull new ...
![Page 11: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/11.jpg)
Feedback
Split cleanup and yak shaving
Additional use of feature
Add benchmark data
Add tests
Fix typo
![Page 12: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/12.jpg)
Feedback
Split cleanup and yak shaving
Additional use of feature
Add benchmark data
Add tests
Fix typo
![Page 13: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/13.jpg)
Feedback
Split cleanup and yak shaving
Additional use of feature
Add benchmark data
Add tests
Fix typo
![Page 14: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/14.jpg)
Feedback
Split cleanup and yak shaving
Additional use of feature
Add benchmark data
Add tests
Fix typo
![Page 15: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/15.jpg)
Feedback
Split cleanup and yak shaving
Additional use of feature
Add benchmark data
Add tests
Fix typo
![Page 16: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/16.jpg)
Rewriting history
![Page 17: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/17.jpg)
git commit --amend
![Page 18: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/18.jpg)
git rebase -i
![Page 19: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/19.jpg)
“fast-forward” vs “non-fast-forward”
![Page 20: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/20.jpg)
git format-patch -v2 -6
[PATCH v2 1/6] Cleanup
[PATCH v2 2/6] Yak shaving
[PATCH v2 3/6] Implement feature
[PATCH v2 4/6] Tests for feature
[PATCH v2 5/6] Use feature
[PATCH v2 6/6] Use feature elsewhere
![Page 21: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/21.jpg)
git format-patch -v2 -6
[PATCH v2 1/6] Cleanup
[PATCH v2 2/6] Yak shaving
[PATCH v2 3/6] Implement feature
[PATCH v2 4/6] Tests for feature
[PATCH v2 5/6] Use feature
[PATCH v2 6/6] Use feature elsewhere
![Page 22: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/22.jpg)
What about v1?
![Page 23: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/23.jpg)
git reflog
![Page 24: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/24.jpg)
mutt -f =Sent
![Page 25: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/25.jpg)
Public mailing list archives
![Page 26: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/26.jpg)
Git tracks history
![Page 27: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/27.jpg)
We rewrite history
![Page 28: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/28.jpg)
We need the history of history
![Page 29: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/29.jpg)
git submodule
-- --fthagn
![Page 30: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/30.jpg)
git submodule -- --fthagn
![Page 31: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/31.jpg)
Two common solutions
Pull one of the histories out of git
![Page 32: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/32.jpg)
Two common solutions
Pull one of the histories out of git
![Page 33: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/33.jpg)
Pull the patches out of git
![Page 34: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/34.jpg)
quilt patch files
![Page 35: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/35.jpg)
debian/patches/*
![Page 36: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/36.jpg)
git rebase -i
![Page 37: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/37.jpg)
Pull the history of the patches out of git
![Page 38: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/38.jpg)
Versioned branch names
![Page 39: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/39.jpg)
feature-v1
feature-v2
feature-v3-typofix
feature-v8-rebased-4.6-alice-fix
feature-v8-rebased-4.6-alice-fix.pptx
![Page 40: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/40.jpg)
feature-v1
feature-v2
feature-v3-typofix
feature-v8-rebased-4.6-alice-fix
feature-v8-rebased-4.6-alice-fix.pptx
![Page 41: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/41.jpg)
feature-v1
feature-v2
feature-v3-typofix
feature-v8-rebased-4.6-alice-fix
feature-v8-rebased-4.6-alice-fix.pptx
![Page 42: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/42.jpg)
feature-v1
feature-v2
feature-v3-typofix
feature-v8-rebased-4.6-alice-fix
feature-v8-rebased-4.6-alice-fix.pptx
![Page 43: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/43.jpg)
feature-v1
feature-v2
feature-v3-typofix
feature-v8-rebased-4.6-alice-fix
feature-v8-rebased-4.6-alice-fix.pptx
![Page 44: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/44.jpg)
We have a version control system!
![Page 45: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/45.jpg)
Cover letter
[PATCH v2 0/5] feature: summary of new idea
![Page 46: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/46.jpg)
Cover letter
[PATCH v2 0/5] feature: summary of new idea
![Page 47: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/47.jpg)
Base
git format-patch -3
git format-patch -v2 -6
git rebase -i ...
git log
![Page 48: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/48.jpg)
Base
git format-patch -3
git format-patch -v2 -6
git rebase -i ...
git log
![Page 49: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/49.jpg)
Base
git format-patch -3
git format-patch -v2 -6
git rebase -i ...
git log
![Page 50: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/50.jpg)
Base
git format-patch -3
git format-patch -v2 -6
git rebase -i ...
git log
![Page 51: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/51.jpg)
Collaboration
![Page 52: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/52.jpg)
“Never rewrite published history”
![Page 53: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/53.jpg)
How can you collaborate on it?
![Page 54: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/54.jpg)
Patch series
Feature backport
Distribution package
![Page 55: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/55.jpg)
Patch series
Feature backport
Distribution package
![Page 56: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/56.jpg)
Patch series
Feature backport
Distribution package
![Page 57: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/57.jpg)
git-series
Tracks the history of a patch series
Handles non-fast-forwarding changes
Tracks a cover letter
Tracks the base of the series
![Page 58: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/58.jpg)
git-series
Tracks the history of a patch series
Handles non-fast-forwarding changes
Tracks a cover letter
Tracks the base of the series
![Page 59: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/59.jpg)
git-series
Tracks the history of a patch series
Handles non-fast-forwarding changes
Tracks a cover letter
Tracks the base of the series
![Page 60: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/60.jpg)
git-series
Tracks the history of a patch series
Handles non-fast-forwarding changes
Tracks a cover letter
Tracks the base of the series
![Page 61: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/61.jpg)
git-series
Tracks the history of a patch series
Handles non-fast-forwarding changes
Tracks a cover letter
Tracks the base of the series
![Page 62: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/62.jpg)
Demo
![Page 63: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/63.jpg)
Internals
INTERNALS.mdhttps://github.com/git-series/git-series/blob/master/INTERNALS.md
![Page 64: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/64.jpg)
Internals
INTERNALS.mdhttps://github.com/git-series/git-series/blob/master/INTERNALS.md
![Page 65: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/65.jpg)
Review of git internals
blob (file)
tree (directory)
commit (tree, message, parents)
tag
ref
![Page 66: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/66.jpg)
Review of git internals
blob (file)
tree (directory)
commit (tree, message, parents)
tag
ref
![Page 67: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/67.jpg)
Review of git internals
blob (file)
tree (directory)
commit (tree, message, parents)
tag
ref
![Page 68: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/68.jpg)
Review of git internals
blob (file)
tree (directory)
commit (tree, message, parents)
tag
ref
![Page 69: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/69.jpg)
Review of git internals
blob (file)
tree (directory)
commit (tree, message, parents)
tag
ref
![Page 70: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/70.jpg)
Review of git internals
blob (file)
tree (directory)
commit (tree, message, parents)
tag
ref
![Page 71: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/71.jpg)
trees can refer to commits
“gitlink”
![Page 72: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/72.jpg)
trees can refer to commits
“gitlink”
![Page 73: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/73.jpg)
Requirement: Every object must remain reachable by git.
Required to keep git from pruning objects
Required for push/pull of series
![Page 74: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/74.jpg)
Requirement: Every object must remain reachable by git.
Required to keep git from pruning objects
Required for push/pull of series
![Page 75: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/75.jpg)
upstream x
upstream y
v1 b
v1 a
v2 b
v2 a
series v1 series v2 refs/heads/git-series/feature
series
base
series
base
cover letter blob
cover
![Page 76: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/76.jpg)
upstream x
upstream y
v1 b
v1 a
v2 b
v2 a
series v1 series v2
refs/heads/git-series/feature
series
base
series
base
cover letter blob
cover
![Page 77: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/77.jpg)
upstream x
upstream y
v1 b
v1 a
v2 b
v2 a
series v1 series v2 refs/heads/git-series/feature
series
base
series
base
cover letter blob
cover
![Page 78: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/78.jpg)
upstream x
upstream y
v1 b
v1 a
v2 b
v2 a
series v1 series v2 refs/heads/git-series/feature
series
base
series
base
cover letter blob
cover
![Page 79: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/79.jpg)
upstream x
upstream y
v1 b
v1 a
v2 b
v2 a
series v1 series v2 refs/heads/git-series/feature
series
base
series
base
cover letter blob
cover
![Page 80: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/80.jpg)
upstream x
upstream y
v1 b
v1 a
v2 b
v2 a
series v1 series v2 refs/heads/git-series/feature
series
base
series
base
cover letter blob
cover
![Page 81: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/81.jpg)
upstream x
upstream y
v1 b
v1 a
v2 b
v2 a
series v1 series v2 refs/heads/git-series/feature
series
base
series
base
cover letter blob
cover
![Page 82: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/82.jpg)
upstream x
upstream y
v1 b
v1 a
v2 b
v2 a
series v1 series v2 refs/heads/git-series/feature
series
base
series
base
cover letter blob
cover
![Page 83: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/83.jpg)
git doesn’t follow gitlinks for reachability or push/pull
Have to also include “series” as a parent
git-series ignores that parent when traversing
![Page 84: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/84.jpg)
git doesn’t follow gitlinks for reachability or push/pull
Have to also include “series” as a parent
git-series ignores that parent when traversing
![Page 85: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/85.jpg)
git doesn’t follow gitlinks for reachability or push/pull
Have to also include “series” as a parent
git-series ignores that parent when traversing
![Page 86: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/86.jpg)
HEAD → Current branch
refs/SHEAD → Current series
![Page 87: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/87.jpg)
HEAD → Current branch
refs/SHEAD → Current series
![Page 88: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/88.jpg)
Working and staged (as seen in status)?
refs/git-series-internals/working/feature
refs/git-series-internals/staged/feature
![Page 89: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/89.jpg)
Working and staged (as seen in status)?
refs/git-series-internals/working/feature
refs/git-series-internals/staged/feature
![Page 90: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/90.jpg)
Avoiding errors
![Page 91: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/91.jpg)
Long and complex error messages
suggest a design flaw
Redesign to make the error impossible
![Page 92: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/92.jpg)
Long and complex error messagessuggest a design flaw
Redesign to make the error impossible
![Page 93: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/93.jpg)
Long and complex error messagessuggest a design flaw
Redesign to make the error impossible
![Page 94: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/94.jpg)
Detach from a series or check out a newseries with uncommitted changes to the
series (series, base, cover)
Every series has its own independentworking and staged versions
![Page 95: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/95.jpg)
Detach from a series or check out a newseries with uncommitted changes to the
series (series, base, cover)
Every series has its own independentworking and staged versions
![Page 96: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/96.jpg)
Detach from a series or check out a newseries without making any commits
git series start makes working/staged“(new, no commits yet)”
git series checkout works
![Page 97: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/97.jpg)
Detach from a series or check out a newseries without making any commits
git series start makes working/staged
“(new, no commits yet)”git series checkout works
![Page 98: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/98.jpg)
Detach from a series or check out a newseries without making any commits
git series start makes working/staged“(new, no commits yet)”
git series checkout works
![Page 99: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/99.jpg)
Detach from a series or check out a newseries without making any commits
git series start makes working/staged“(new, no commits yet)”
git series checkout works
![Page 100: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/100.jpg)
Long and complex error messagessuggest a design flaw
Redesign to make the error impossible
![Page 101: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/101.jpg)
git series rebase
git rebase --continue
![Page 102: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/102.jpg)
git series rebase
git rebase --continue
![Page 103: Versioning commits and patches with git-series](https://reader033.fdocuments.in/reader033/viewer/2022051319/58a2db281a28aba27f8b794b/html5/thumbnails/103.jpg)
Rust and libgit2