Skip to content

Commit d1ee2f3

Browse files
committed
Update html-rendered version of rstudio manual
1 parent f8a9f94 commit d1ee2f3

1 file changed

Lines changed: 32 additions & 5 deletions

File tree

docs/manual-git-rstudio.html

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -520,13 +520,24 @@ <h3 id="git-for-rstudio-setup-2">Git for RStudio setup</h3>
520520
<h3 id="git-for-rstudio-setup-git-configuration">Git for RStudio setup: git configuration</h3>
521521
<ol type="1">
522522
<li>Go to <code>Tools &gt; Shell</code> to open the Git Shell</li>
523-
<li>Tell Git your username and GitHub email (!)</li>
523+
<li>Tell Git your Github (!) username and GitHub email</li>
524524
</ol>
525-
<p><em>TODO Stijn: how to set username and email?</em></p>
526525
<p><img src="manual-git/Rstudio-GitShell.png" alt="RStudio setup git shell" /></p>
527526
</section>
528527
<section class="slide level2">
529528

529+
<h3 id="git-for-rstudio-setup-git-configuration-1">Git for RStudio setup: git configuration</h3>
530+
<ol type="1">
531+
<li>Go to <code>Tools &gt; Shell</code> to open the Git Shell</li>
532+
<li>Tell Git your Github (!) username and GitHub email:</li>
533+
</ol>
534+
<p>In the shell, type the following two commands:</p>
535+
<pre><code>git config --global user.email &quot;my.name@inbo.be&quot;
536+
git config --global user.name &quot;mygithubusername&quot;</code></pre>
537+
<p>Use your GitHub username!</p>
538+
</section>
539+
<section class="slide level2">
540+
530541
<h3 id="clone-a-repo-to-work-locally">Clone a repo to work locally</h3>
531542
<ol type="1">
532543
<li>Copy the repository HTTPS url</li>
@@ -614,15 +625,15 @@ <h3 id="create-logical-commits">Create logical commits</h3>
614625
<ol type="1">
615626
<li>Make 2 unrelated changes to your <code>README.md</code> locally</li>
616627
<li>Create one commit for each change.</li>
617-
<li>Do not push (yet)</li>
628+
<li>Do NOT push (yet)</li>
618629
</ol>
619630
</section>
620631
<section class="slide level2">
621632

622633
<h3 id="create-logical-commits-1">Create logical commits</h3>
623634
<ol type="1">
624635
<li>Click <code>Commit</code> in the <code>git</code> pane</li>
625-
<li>Select the changes you can to commit and click <code>stage selection</code></li>
636+
<li>Select the changes you want to commit and click <code>stage selection</code></li>
626637
<li>Add a <code>commit message</code> and click <code>Commit</code></li>
627638
</ol>
628639
<p><img src="manual-git/logical-commit-rstudio.png" alt="Logical commit 1" style="width:80.0%" /></p>
@@ -917,6 +928,22 @@ <h3 id="some-more-advice">Some more advice:</h3>
917928
</section>
918929
<section class="slide level2">
919930

931+
<p>…but if you’re hungry:</p>
932+
<ul>
933+
<li>Webinars
934+
<ul>
935+
<li><a href="https://www.rstudio.com/resources/webinars/rstudio-essentials-webinar-series-managing-part-2/">Github and Rstudio management</a></li>
936+
<li><a href="https://www.rstudio.com/resources/webinars/collaboration-and-time-travel-version-control-with-git-github-and-rstudio/">Collaboration and time travel: version control with git, github and RStudio</a></li>
937+
</ul></li>
938+
<li>Tutorials
939+
<ul>
940+
<li><a href="http://r-pkgs.had.co.nz/git.html">Hadley Wickham R packages book</a></li>
941+
<li><a href="http://happygitwithr.com/index.html">Happy Git and GitHub for the useR</a></li>
942+
</ul></li>
943+
</ul>
944+
</section>
945+
<section class="slide level2">
946+
920947
<p>Information combined at <a href="https://inbo.github.io/tutorials/">INBO Tutorials website</a>. <br/>You’re welcome to provide issues, pull requests,…</p>
921948
</section>
922949
</div>
@@ -955,7 +982,7 @@ <h3 id="some-more-advice">Some more advice:</h3>
955982
(function () {
956983
var script = document.createElement("script");
957984
script.type = "text/javascript";
958-
script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
985+
script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
959986
document.getElementsByTagName("head")[0].appendChild(script);
960987
})();
961988
</script>

0 commit comments

Comments
 (0)