create logical commits

Author: ThierryO

docs/manual-git-rstudio.html

@@ -620,12 +620,31 @@ <h3 id="create-logical-commits">Create logical commits</h3>
 <section class="slide level2">
 
 <h3 id="create-logical-commits-1">Create logical commits</h3>
-<p>TODO-Thierry: update fig to rstudio <img src="manual-git/logical-commit-1.png" alt="Logical commit 1" /></p>
+<ol type="1">
+<li>Click <code>Commit</code> in the <code>git</code> pane</li>
+<li>Select the changes you can to commit and click <code>stage selection</code></li>
+<li>Add a <code>commit message</code> and click <code>Commit</code></li>
+</ol>
+<p><img src="manual-git/logical-commit-rstudio.png" alt="Logical commit 1" style="width:80.0%" /></p>
 </section>
 <section class="slide level2">
 
 <h3 id="create-logical-commits-2">Create logical commits</h3>
-<p>TODO-Thierry: update fig to rstudio <img src="manual-git/logical-commit-2.png" alt="Logical commit 2" /></p>
+<ul>
+<li><code>stage xyz</code>: add the xyz from the commit</li>
+<li><code>unstage xyz</code>: remove the xyz from the commit</li>
+<li><code>discard xyz</code>: revert the changes in the xyz (can’t be undone!!!)</li>
+<li><code>xyz</code> can be
+<ul>
+<li>a single <code>line</code></li>
+<li>a <code>selection</code> of lines</li>
+<li>a <code>chunk</code>
+<ul>
+<li>RStudio will automatically split the changes in chunks</li>
+<li>chunks are defined by 10 unchanged lines between changes</li>
+</ul></li>
+</ul></li>
+</ul>
 </section>
 <section class="slide level2">
 

docs/manual-git/logical-commit-rstudio.png

@@ -187,15 +187,25 @@ _TODO Stijn: how to set username and email?_
 
 ### Create logical commits
 
-TODO-Thierry: update fig to rstudio
-![Logical commit 1](manual-git/logical-commit-1.png)
+1. Click `Commit` in the `git` pane
+1. Select the changes you can to commit and click `stage selection`
+1. Add a `commit message` and click `Commit`
+
+![Logical commit 1](manual-git/logical-commit-rstudio.png){width=80%}
 
 ---
 
 ### Create logical commits
 
-TODO-Thierry: update fig to rstudio
-![Logical commit 2](manual-git/logical-commit-2.png)
+- `stage xyz`: add the xyz from the commit
+- `unstage xyz`: remove the xyz from the commit
+- `discard xyz`: revert the changes in the xyz (can't be undone!!!)
+- `xyz` can be
+    - a single `line`
+    - a `selection` of lines
+    - a `chunk`
+        - RStudio will automatically split the changes in chunks
+        - chunks are defined by 10 unchanged lines between changes
 
 ---