Skip to content

Git #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stijnvanhoey merged 29 commits into from
May 31, 2017
Merged

Git #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
e9c6108
Exclude command line sections
stijnvanhoey May 29, 2017
281a527
Convert to github destop oriented session
stijnvanhoey May 29, 2017
b9a14ec
Remove old all-in-one version
stijnvanhoey May 29, 2017
4b5b42e
Remove figs of all-in-one version
stijnvanhoey May 29, 2017
d62d4ef
Update git tabs to include 3 manuals
stijnvanhoey May 29, 2017
0bf1d54
Provide rstudio version of git tutorial
stijnvanhoey May 29, 2017
395a653
Add md loaded figures
stijnvanhoey May 29, 2017
539ead4
Add rendered Rstudio version of git tut
stijnvanhoey May 29, 2017
934e6bc
Add command line version of git tutorial
stijnvanhoey May 29, 2017
f2d25f2
Add rendered cmd version of git tutorial
stijnvanhoey May 29, 2017
ce7975c
add screenshot for creating a git project in RStudio
ThierryO May 29, 2017
821c3be
handle .gitignore
ThierryO May 31, 2017
34acaf1
make first local commits
ThierryO May 31, 2017
d0a0515
push changes to github
ThierryO May 31, 2017
90af6ae
store git credentials when using https
ThierryO May 31, 2017
327db15
create logical commits
ThierryO May 31, 2017
8ff9e93
solve conflicts
ThierryO May 31, 2017
ce07424
add files in a directory and amend previous commit
ThierryO May 31, 2017
cd1ea71
mention that the .gitignore details will be handled later
ThierryO May 31, 2017
3b48b93
view history
ThierryO May 31, 2017
02b11cc
how to create and push a new branch and switch to a branch
ThierryO May 31, 2017
8512b46
fix typo
ThierryO May 31, 2017
9e340ab
use pull to update the repo with the origin
ThierryO May 31, 2017
d6f07fc
add screenshots on .gitignore
ThierryO May 31, 2017
d51f0fd
Add git config information to Rstudio
stijnvanhoey May 31, 2017
f8a9f94
Add links to further material
stijnvanhoey May 31, 2017
d1ee2f3
Update html-rendered version of rstudio manual
stijnvanhoey May 31, 2017
17b83fd
Rerun website rendering
stijnvanhoey May 31, 2017
53b530d
Add git desktop manual html page
stijnvanhoey May 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions docs/data-handling-database-R.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<head>

<meta charset="utf-8">
<meta charset="utf-8" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="pandoc" />

Expand Down Expand Up @@ -255,7 +255,13 @@
</a>
<ul class="dropdown-menu" role="menu">
<li>
<a href="manual-git.html">Git hands-on session</a>
<a href="manual-git-desktop.html">Git hands-on session using Github Desktop</a>
</li>
<li>
<a href="manual-git-rstudio.html">Git hands-on session using Rstudio</a>
</li>
<li>
<a href="manual-git-cmd.html">Git hands-on session using the command line</a>
</li>
<li>
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
Expand Down Expand Up @@ -462,7 +468,7 @@ <h2>The <code>sprintf</code> function</h2>
(function () {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
document.getElementsByTagName("head")[0].appendChild(script);
})();
</script>
Expand Down
74 changes: 57 additions & 17 deletions docs/data-handling-googlesheet-R.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<head>

<meta charset="utf-8">
<meta charset="utf-8" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="pandoc" />

Expand Down Expand Up @@ -255,7 +255,13 @@
</a>
<ul class="dropdown-menu" role="menu">
<li>
<a href="manual-git.html">Git hands-on session</a>
<a href="manual-git-desktop.html">Git hands-on session using Github Desktop</a>
</li>
<li>
<a href="manual-git-rstudio.html">Git hands-on session using Rstudio</a>
</li>
<li>
<a href="manual-git-cmd.html">Git hands-on session using the command line</a>
</li>
<li>
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
Expand Down Expand Up @@ -308,20 +314,20 @@ <h2>Setup</h2>
<p>Make sure the token is savely stored within your project folder without sharing it or putting it into the version control history. If you need more power (e.g. necessity of integration services such as Travis CI), check the encryption options in <a href="https://rawgit.com/jennybc/googlesheets/master/vignettes/managing-auth-tokens.html">this manual</a>.</p>
<p>Once registered, an overview of your available google sheets is provided as follows:</p>
<pre class="r"><code>gs_ls()</code></pre>
<pre><code>## # A tibble: 188 × 10
<pre><code>## # A tibble: 199 x 10
## sheet_title author perm version
## &lt;chr&gt; &lt;chr&gt; &lt;chr&gt; &lt;chr&gt;
## 1 overzicht SVZ migratie … joost.sturte… rw old
## 2 Opleiding Git(hub) stijn.vanhoey rw old
## 3 Opleiding scripting maarten.stev… rw old
## 4 INBO A1 publications 20… peter.desmet rw old
## 5 400+ Tools and innovati… jeroensbox rw old
## 6 T0 sources datasets sander.devis… rw old
## 7 INBO en lopen gerald.louet… rw old
## 8 Statistics peter.desmet rw old
## 9 LifeWatch budget en uit… peter.desmet… rw old
## 10 vergelijking fotodataba… tanja.milotic rw old
## # ... with 178 more rows, and 6 more variables: updated &lt;dttm&gt;,
## 1 400+ Tools and innovati… jeroensbox rw old
## 2 IDC-budget 2017 daniel.duseu… rw old
## 3 LifeWatch budget en uit… peter.desmet… rw old
## 4 DQ Tests-Assertions - P… godfoder rw old
## 5 overzicht netwerken en … tessa.vansan… rw old
## 6 GIS Inventarisatie (Rea… sander.devis… r old
## 7 Development Planning 20… kevin.azijn rw old
## 8 Teamgegevens voor Vlimp… dieter.viaene rw old
## 9 Kleed en gedrag peter.desmet rw old
## 10 SAFRED-dataset_inventory aaike.dewever rw old
## # ... with 189 more rows, and 6 more variables: updated &lt;dttm&gt;,
## # sheet_key &lt;chr&gt;, ws_feed &lt;chr&gt;, alternate &lt;chr&gt;, self &lt;chr&gt;,
## # alt_key &lt;chr&gt;</code></pre>
</div>
Expand All @@ -342,12 +348,46 @@ <h2>I just want to load a google spreadsheet</h2>
<pre class="r"><code>breedingbirds &lt;- redlists %&gt;%
gs_read(ws = &quot;BreedingBirds&quot;)</code></pre>
<pre><code>## Accessing worksheet titled &#39;BreedingBirds&#39;.</code></pre>
<pre><code>## No encoding supplied: defaulting to UTF-8.</code></pre>
<pre><code>##
Downloading: 1.4 kB
Downloading: 1.4 kB
Downloading: 2.2 kB
Downloading: 2.2 kB
Downloading: 3.5 kB
Downloading: 3.5 kB
Downloading: 4.6 kB
Downloading: 4.6 kB
Downloading: 5.6 kB
Downloading: 5.6 kB
Downloading: 5.6 kB
Downloading: 5.6 kB
Downloading: 5.6 kB
Downloading: 5.6 kB</code></pre>
<pre><code>## Parsed with column specification:
## cols(
## TaxonomicGroup = col_character(),
## Class = col_character(),
## Order = col_character(),
## Family = col_character(),
## Genus = col_character(),
## Species = col_character(),
## Speciesname = col_character(),
## SpeciesnameDutch = col_character(),
## RLC = col_character(),
## RLCEurope = col_character(),
## Biome = col_character(),
## Biotope = col_character(),
## Lifespan = col_character(),
## Mobility = col_character(),
## Criteria = col_character(),
## Spine = col_character(),
## Trophy = col_character()
## )</code></pre>
<p>Inspecting the data of the sheet:</p>
<pre class="r"><code>class(breedingbirds)</code></pre>
<pre><code>## [1] &quot;tbl_df&quot; &quot;tbl&quot; &quot;data.frame&quot;</code></pre>
<pre class="r"><code>head(breedingbirds)</code></pre>
<pre><code>## # A tibble: 6 × 17
<pre><code>## # A tibble: 6 x 17
## TaxonomicGroup Class Order Family Genus Species
## &lt;chr&gt; &lt;chr&gt; &lt;chr&gt; &lt;chr&gt; &lt;chr&gt; &lt;chr&gt;
## 1 BreedingBirds Aves Accipitriformes Accipitridae Circus aeruginosus
Expand Down Expand Up @@ -390,7 +430,7 @@ <h2>I just want to load a google spreadsheet</h2>
(function () {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
document.getElementsByTagName("head")[0].appendChild(script);
})();
</script>
Expand Down
12 changes: 9 additions & 3 deletions docs/data-handling-large-files-R.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<head>

<meta charset="utf-8">
<meta charset="utf-8" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="pandoc" />

Expand Down Expand Up @@ -257,7 +257,13 @@
</a>
<ul class="dropdown-menu" role="menu">
<li>
<a href="manual-git.html">Git hands-on session</a>
<a href="manual-git-desktop.html">Git hands-on session using Github Desktop</a>
</li>
<li>
<a href="manual-git-rstudio.html">Git hands-on session using Rstudio</a>
</li>
<li>
<a href="manual-git-cmd.html">Git hands-on session using the command line</a>
</li>
<li>
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
Expand Down Expand Up @@ -660,7 +666,7 @@ <h3>Create a SQLite databases from a CSV file</h3>
(function () {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
document.getElementsByTagName("head")[0].appendChild(script);
})();
</script>
Expand Down
12 changes: 9 additions & 3 deletions docs/development-styleguide-R.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<head>

<meta charset="utf-8">
<meta charset="utf-8" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="pandoc" />

Expand Down Expand Up @@ -255,7 +255,13 @@
</a>
<ul class="dropdown-menu" role="menu">
<li>
<a href="manual-git.html">Git hands-on session</a>
<a href="manual-git-desktop.html">Git hands-on session using Github Desktop</a>
</li>
<li>
<a href="manual-git-rstudio.html">Git hands-on session using Rstudio</a>
</li>
<li>
<a href="manual-git-cmd.html">Git hands-on session using the command line</a>
</li>
<li>
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
Expand Down Expand Up @@ -698,7 +704,7 @@ <h2>RMarkdown</h2>
(function () {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
document.getElementsByTagName("head")[0].appendChild(script);
})();
</script>
Expand Down
12 changes: 9 additions & 3 deletions docs/development-styleguide-repos.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<head>

<meta charset="utf-8">
<meta charset="utf-8" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="pandoc" />

Expand Down Expand Up @@ -255,7 +255,13 @@
</a>
<ul class="dropdown-menu" role="menu">
<li>
<a href="manual-git.html">Git hands-on session</a>
<a href="manual-git-desktop.html">Git hands-on session using Github Desktop</a>
</li>
<li>
<a href="manual-git-rstudio.html">Git hands-on session using Rstudio</a>
</li>
<li>
<a href="manual-git-cmd.html">Git hands-on session using the command line</a>
</li>
<li>
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
Expand Down Expand Up @@ -325,7 +331,7 @@ <h2>READMEs</h2>
(function () {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
document.getElementsByTagName("head")[0].appendChild(script);
})();
</script>
Expand Down
12 changes: 9 additions & 3 deletions docs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<head>

<meta charset="utf-8">
<meta charset="utf-8" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="pandoc" />

Expand Down Expand Up @@ -255,7 +255,13 @@
</a>
<ul class="dropdown-menu" role="menu">
<li>
<a href="manual-git.html">Git hands-on session</a>
<a href="manual-git-desktop.html">Git hands-on session using Github Desktop</a>
</li>
<li>
<a href="manual-git-rstudio.html">Git hands-on session using Rstudio</a>
</li>
<li>
<a href="manual-git-cmd.html">Git hands-on session using the command line</a>
</li>
<li>
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
Expand Down Expand Up @@ -313,7 +319,7 @@ <h1 class="title toc-ignore">INBO Tutorials</h1>
(function () {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
document.getElementsByTagName("head")[0].appendChild(script);
})();
</script>
Expand Down
12 changes: 9 additions & 3 deletions docs/installation-R-admin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<head>

<meta charset="utf-8">
<meta charset="utf-8" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="pandoc" />

Expand Down Expand Up @@ -255,7 +255,13 @@
</a>
<ul class="dropdown-menu" role="menu">
<li>
<a href="manual-git.html">Git hands-on session</a>
<a href="manual-git-desktop.html">Git hands-on session using Github Desktop</a>
</li>
<li>
<a href="manual-git-rstudio.html">Git hands-on session using Rstudio</a>
</li>
<li>
<a href="manual-git-cmd.html">Git hands-on session using the command line</a>
</li>
<li>
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
Expand Down Expand Up @@ -434,7 +440,7 @@ <h2>Ubuntu</h2>
(function () {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
document.getElementsByTagName("head")[0].appendChild(script);
})();
</script>
Expand Down
12 changes: 9 additions & 3 deletions docs/installation-R-user.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<head>

<meta charset="utf-8">
<meta charset="utf-8" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="pandoc" />

Expand Down Expand Up @@ -255,7 +255,13 @@
</a>
<ul class="dropdown-menu" role="menu">
<li>
<a href="manual-git.html">Git hands-on session</a>
<a href="manual-git-desktop.html">Git hands-on session using Github Desktop</a>
</li>
<li>
<a href="manual-git-rstudio.html">Git hands-on session using Rstudio</a>
</li>
<li>
<a href="manual-git-cmd.html">Git hands-on session using the command line</a>
</li>
<li>
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
Expand Down Expand Up @@ -344,7 +350,7 @@ <h3>Linux</h3>
(function () {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
document.getElementsByTagName("head")[0].appendChild(script);
})();
</script>
Expand Down
12 changes: 9 additions & 3 deletions docs/installation-RStudio-admin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<head>

<meta charset="utf-8">
<meta charset="utf-8" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="pandoc" />

Expand Down Expand Up @@ -255,7 +255,13 @@
</a>
<ul class="dropdown-menu" role="menu">
<li>
<a href="manual-git.html">Git hands-on session</a>
<a href="manual-git-desktop.html">Git hands-on session using Github Desktop</a>
</li>
<li>
<a href="manual-git-rstudio.html">Git hands-on session using Rstudio</a>
</li>
<li>
<a href="manual-git-cmd.html">Git hands-on session using the command line</a>
</li>
<li>
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
Expand Down Expand Up @@ -336,7 +342,7 @@ <h3>Afwijkingen t.o.v. default installatie</h3>
(function () {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
document.getElementsByTagName("head")[0].appendChild(script);
})();
</script>
Expand Down
Loading