Achilleas Koutsou 5 anos atrás
pai
commit
0bc7640546
2 arquivos alterados com 38 adições e 2 exclusões
  1. 6 0
      demoscript
  2. 32 2
      slides.md

+ 6 - 0
demoscript

@@ -190,8 +190,14 @@ mdprint 'git commit -m "Add third presentation slide"'
 rpmasterdemod=$(mdprint git rev-parse master~1 demo-code~1)
 replace "::rpmasterdemod::" "${rpmasterdemod}"
 
+gitloga=$(mdprint git log -n 2)
+replace "::gitloga::" "${gitloga}"
 
+gitlogb=$(mdprint 'git log --pretty=format:"Commit: %h | Parent: %p | Tree: %t %n Message: %s%n"')
+replace "::gitlogb::" "${gitlogb}"
 
+gitlogc=$(mdprint 'git log --graph --oneline master demo-code')
+replace "::gitlogc::" "${gitlogc}"
 
 exit
 

+ 32 - 2
slides.md

@@ -93,6 +93,9 @@ Which of these statements are true?
 # Part 2.5
 ## Hash functions
 
+Note:
+Before we talk more about Git, let me take a minute to talk about hash functions.
+
 ---
 
 What is a hash function?
@@ -834,7 +837,7 @@ Let's discuss what the revision history will look like.
 ```
 
 Note:
-Thins are starting to look like a graph now.
+Things are starting to look like a graph now.
 
 The new interesting thing to note now is that c3 and c4 both have the same parent, c2.
 
@@ -849,11 +852,38 @@ Let's verify our diagram
 
 ---
 
+# Part 3.2
+## The Log
+
+---
 
+`git log` is your tool for exploring the commit history
+
+Note:
+git log is a powerful tool for exploring the commit history. It prints a sequence of commits, by default in reverse chronological order
 
 ---
 
-# Part 3.2
+::gitloga::
+
+Note:
+The -n flag limits the number of commits to show
+
+By default, it starts from HEAD and goes back through parents
+
+---
+
+Formatting the Log
+
+::gitlogb::
+
+---
+
+::gitlogc::
+
+---
+
+# Part 3.3
 ## Detour: Packs and Deltas
 
 ---