history

Author: teranex

img/git-13.png

@@ -537,13 +537,6 @@
           </section>
         </div>
 
-        <div class="slide">
-          <header><h1>History</h1></header>
-          <section class="small">
-              
-          </section>
-        </div>
-                
         <div class="slide">
           <header><h1>The Index (Staging Area)</h1></header>
           <section class="small">
@@ -575,6 +568,44 @@
 
 
 
+          </section>
+        </div>
+                
+        <div class="slide">
+          <header><h1>Viewing the history</h1></header>
+          <section class="small">
+              <pre><code>git log
+</code></pre>
+
+<p><img src="img/git-13.png" alt="git-13" /></p>
+
+
+
+          </section>
+        </div>
+                
+        <div class="slide">
+          <header><h1>Viewing the history</h1></header>
+          <section class="small">
+              <p><code>git log</code> has many options. The following:</p>
+
+<pre><code>git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset \
+%s %Cgreen(%cr) %C(bold blue)an&gt;%Creset' --abbrev-commit --date=relative
+</code></pre>
+
+<p>Will give you this, which gives <strong>a lot</strong> more information</p>
+
+<p><img src="img/git-11.png" alt="git-11" /></p>
+
+<p>Tip: add this in your global gitconfig as an alias: ~/.gitconfig</p>
+
+<pre><code>[alias]
+    l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s 
+    %Cgreen(%cr) %C(bold blue)&lt;%an&gt;%Creset' --abbrev-commit --date=relative    
+</code></pre>
+
+
+
           </section>
         </div>
 

version-control-with-git.html5.html

@@ -36,8 +36,6 @@ title: Version Control with Git
 
 ![git-01](img/git-01.png)
 
-# History
-
 # The Index (Staging Area)
 The index contains the changes to will be added to your next commit. Your commit will /not/ contain the changes in your working directory. Only the changes that were added to the index!
 
@@ -57,6 +55,27 @@ not end up in your commit, unless you add the file again to the index!
 
 Let's make some more changes and add some of these changes to the index.
 
+# Viewing the history
+    git log
+
+![git-13](img/git-13.png)
+
+# Viewing the history
+`git log` has many options. The following:
+
+    git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset \
+    %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
+
+Will give you this, which gives **a lot** more information
+
+![git-11](img/git-11.png)
+
+Tip: add this in your global gitconfig as an alias: ~/.gitconfig
+
+    [alias]
+        l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s 
+        %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative    
+
 # Undoing changes
 ## Checkout
 Checkout a single file. Notice the dashes: `git checkout` is also used in other cases, this makes it clear to Git that you are pointing to a single file.
@@ -264,7 +283,6 @@ Each commit which is rebased will get a new, different, hash. People (and Git) w
 If you do rebase a commit which was already pushed, Git will refuse the new commit, unless you use the `--force` option.
 
 
-
 # Rebasing
 ## Amending changes