Beautiful History
Download as ODP, PDF•0 likes•79 views
The document discusses the history of software and version control using Git. It provides examples of Git commands like git log, git rebase, and git merge. It also discusses best practices for writing commit messages and splitting commits into logical changes.
Beautiful History
- 6. Verstehen
- 8. Lineare Versionsgeschichte Photograph by Tomasz Sienicki (https://commons.wikimedia.org/wiki/File:08_tory_railtrack_ubt.jpeg)
- 9. >git log --oneline 1f754f4 commit A 3e6cf75 merge commit 0d44f84 commit B fa1397a commit C bc4f513 commit D
- 10. A merge B C D
- 11. A C B D
- 12. A merge C B D
- 13. git rebase
- 14. C A D B C A D B C A D B C A D B C A D B C A D B
- 15. git checkout my-branch git rebase master git checkout master git merge --ff-only my-branch
- 17. e5f4b49 Re-adding ConfigurationPostProcessorTests a 2db0f12 fixed two build-breaking issues: + reverted 147709f Tweaks to package-info.java files 22b25e0 Consolidated Util and MutableAnnotationUtil 7f96f57 polishing
- 18. 5ba3db6 Fix failing CompositePropertySourceTests 84564a0 Rework @PropertySource early parsing logic e142fd1 Add tests for ImportSelector meta-data 887815f Update docbook dependency and generate epub ac8326d Polish mockito usage
- 19. Short (50 chars or less) summary of changes More detailed explanatory text, if necessary. Wrap it to about 72 characters or so. In some contexts, the first line is treated as the subject of an email and the rest of the text as the body. The blank line separating the summary from the body is critical (unless you omit the body entirely); tools like rebase can get confused if you run the two together. Further paragraphs come after blank lines. - Bullet points are okay, too - Typically a hyphen or asterisk is used for the bullet, preceded by a single space, with blank lines in between, but conventions vary here https://github.com/torvalds/linux/commit/https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project
- 20. clk: x86: Set default parent to 48Mhz System clk provided in ST soc can be set to: 48Mhz, non-spread 25Mhz, spread To get accurate rate, we need it to set it at non-spread option which is 48Mhz. Signed-off-by: Akshu Agrawal <[email protected]> Reviewed-by: Daniel Kurtz <[email protected]> Fixes: 421bf6a ("clk: x86: Add ST oscout platform clock") Signed-off-by: Stephen Boyd <[email protected]> https://github.com/torvalds/linux/commit/bded6c03e398dc6e862dc8301fb9a60175740653
- 21. Warum ist der Commit notwendig? Wie löst er das Problem? Welche Auswirkungen hat die Änderung?
- 30. Record requests that cause Exceptions
- 33. $>git log --oneline 3b7aba0 Record requests that cause Exceptions 59fa226 Extract method "recordSuccessfulDispatch" 2940e0f Extract method "handleRequest" 38f9797 Remove outdated copyright headers 5198445 Extract method "record" f92cecf Fix typo f1eead9 Release 1.0.0
- 34. Ausprobieren
- 36. Vielen Dank!