Skip to content

Commit e9436f6

Browse files
authored
Merge pull request #25 from inbo/git
Git
2 parents 6b23bd8 + 53b530d commit e9436f6

82 files changed

Lines changed: 2946 additions & 263 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docs/data-handling-database-R.html

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<head>
66

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

@@ -255,7 +255,13 @@
255255
</a>
256256
<ul class="dropdown-menu" role="menu">
257257
<li>
258-
<a href="manual-git.html">Git hands-on session</a>
258+
<a href="manual-git-desktop.html">Git hands-on session using Github Desktop</a>
259+
</li>
260+
<li>
261+
<a href="manual-git-rstudio.html">Git hands-on session using Rstudio</a>
262+
</li>
263+
<li>
264+
<a href="manual-git-cmd.html">Git hands-on session using the command line</a>
259265
</li>
260266
<li>
261267
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
@@ -462,7 +468,7 @@ <h2>The <code>sprintf</code> function</h2>
462468
(function () {
463469
var script = document.createElement("script");
464470
script.type = "text/javascript";
465-
script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
471+
script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
466472
document.getElementsByTagName("head")[0].appendChild(script);
467473
})();
468474
</script>

docs/data-handling-googlesheet-R.html

Lines changed: 57 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<head>
66

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

@@ -255,7 +255,13 @@
255255
</a>
256256
<ul class="dropdown-menu" role="menu">
257257
<li>
258-
<a href="manual-git.html">Git hands-on session</a>
258+
<a href="manual-git-desktop.html">Git hands-on session using Github Desktop</a>
259+
</li>
260+
<li>
261+
<a href="manual-git-rstudio.html">Git hands-on session using Rstudio</a>
262+
</li>
263+
<li>
264+
<a href="manual-git-cmd.html">Git hands-on session using the command line</a>
259265
</li>
260266
<li>
261267
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
@@ -308,20 +314,20 @@ <h2>Setup</h2>
308314
<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>
309315
<p>Once registered, an overview of your available google sheets is provided as follows:</p>
310316
<pre class="r"><code>gs_ls()</code></pre>
311-
<pre><code>## # A tibble: 188 × 10
317+
<pre><code>## # A tibble: 199 x 10
312318
## sheet_title author perm version
313319
## &lt;chr&gt; &lt;chr&gt; &lt;chr&gt; &lt;chr&gt;
314-
## 1 overzicht SVZ migratie … joost.sturte… rw old
315-
## 2 Opleiding Git(hub) stijn.vanhoey rw old
316-
## 3 Opleiding scripting maarten.stev… rw old
317-
## 4 INBO A1 publications 20peter.desmet rw old
318-
## 5 400+ Tools and innovati… jeroensbox rw old
319-
## 6 T0 sources datasets sander.devis… rw old
320-
## 7 INBO en lopen gerald.louet… rw old
321-
## 8 Statistics peter.desmet rw old
322-
## 9 LifeWatch budget en uit… peter.desmet rw old
323-
## 10 vergelijking fotodataba… tanja.milotic rw old
324-
## # ... with 178 more rows, and 6 more variables: updated &lt;dttm&gt;,
320+
## 1 400+ Tools and innovati… jeroensbox rw old
321+
## 2 IDC-budget 2017 daniel.duseu… rw old
322+
## 3 LifeWatch budget en uit… peter.desmet… rw old
323+
## 4 DQ Tests-Assertions - P godfoder rw old
324+
## 5 overzicht netwerken en … tessa.vansan… rw old
325+
## 6 GIS Inventarisatie (Rea… sander.devis… r old
326+
## 7 Development Planning 20… kevin.azijn rw old
327+
## 8 Teamgegevens voor Vlimp… dieter.viaene rw old
328+
## 9 Kleed en gedrag peter.desmet rw old
329+
## 10 SAFRED-dataset_inventory aaike.dewever rw old
330+
## # ... with 189 more rows, and 6 more variables: updated &lt;dttm&gt;,
325331
## # sheet_key &lt;chr&gt;, ws_feed &lt;chr&gt;, alternate &lt;chr&gt;, self &lt;chr&gt;,
326332
## # alt_key &lt;chr&gt;</code></pre>
327333
</div>
@@ -342,12 +348,46 @@ <h2>I just want to load a google spreadsheet</h2>
342348
<pre class="r"><code>breedingbirds &lt;- redlists %&gt;%
343349
gs_read(ws = &quot;BreedingBirds&quot;)</code></pre>
344350
<pre><code>## Accessing worksheet titled &#39;BreedingBirds&#39;.</code></pre>
345-
<pre><code>## No encoding supplied: defaulting to UTF-8.</code></pre>
351+
<pre><code>##
352+
Downloading: 1.4 kB
353+
Downloading: 1.4 kB
354+
Downloading: 2.2 kB
355+
Downloading: 2.2 kB
356+
Downloading: 3.5 kB
357+
Downloading: 3.5 kB
358+
Downloading: 4.6 kB
359+
Downloading: 4.6 kB
360+
Downloading: 5.6 kB
361+
Downloading: 5.6 kB
362+
Downloading: 5.6 kB
363+
Downloading: 5.6 kB
364+
Downloading: 5.6 kB
365+
Downloading: 5.6 kB</code></pre>
366+
<pre><code>## Parsed with column specification:
367+
## cols(
368+
## TaxonomicGroup = col_character(),
369+
## Class = col_character(),
370+
## Order = col_character(),
371+
## Family = col_character(),
372+
## Genus = col_character(),
373+
## Species = col_character(),
374+
## Speciesname = col_character(),
375+
## SpeciesnameDutch = col_character(),
376+
## RLC = col_character(),
377+
## RLCEurope = col_character(),
378+
## Biome = col_character(),
379+
## Biotope = col_character(),
380+
## Lifespan = col_character(),
381+
## Mobility = col_character(),
382+
## Criteria = col_character(),
383+
## Spine = col_character(),
384+
## Trophy = col_character()
385+
## )</code></pre>
346386
<p>Inspecting the data of the sheet:</p>
347387
<pre class="r"><code>class(breedingbirds)</code></pre>
348388
<pre><code>## [1] &quot;tbl_df&quot; &quot;tbl&quot; &quot;data.frame&quot;</code></pre>
349389
<pre class="r"><code>head(breedingbirds)</code></pre>
350-
<pre><code>## # A tibble: 6 × 17
390+
<pre><code>## # A tibble: 6 x 17
351391
## TaxonomicGroup Class Order Family Genus Species
352392
## &lt;chr&gt; &lt;chr&gt; &lt;chr&gt; &lt;chr&gt; &lt;chr&gt; &lt;chr&gt;
353393
## 1 BreedingBirds Aves Accipitriformes Accipitridae Circus aeruginosus
@@ -390,7 +430,7 @@ <h2>I just want to load a google spreadsheet</h2>
390430
(function () {
391431
var script = document.createElement("script");
392432
script.type = "text/javascript";
393-
script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
433+
script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
394434
document.getElementsByTagName("head")[0].appendChild(script);
395435
})();
396436
</script>

docs/data-handling-large-files-R.html

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<head>
66

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

@@ -257,7 +257,13 @@
257257
</a>
258258
<ul class="dropdown-menu" role="menu">
259259
<li>
260-
<a href="manual-git.html">Git hands-on session</a>
260+
<a href="manual-git-desktop.html">Git hands-on session using Github Desktop</a>
261+
</li>
262+
<li>
263+
<a href="manual-git-rstudio.html">Git hands-on session using Rstudio</a>
264+
</li>
265+
<li>
266+
<a href="manual-git-cmd.html">Git hands-on session using the command line</a>
261267
</li>
262268
<li>
263269
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
@@ -660,7 +666,7 @@ <h3>Create a SQLite databases from a CSV file</h3>
660666
(function () {
661667
var script = document.createElement("script");
662668
script.type = "text/javascript";
663-
script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
669+
script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
664670
document.getElementsByTagName("head")[0].appendChild(script);
665671
})();
666672
</script>

docs/development-styleguide-R.html

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<head>
66

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

@@ -255,7 +255,13 @@
255255
</a>
256256
<ul class="dropdown-menu" role="menu">
257257
<li>
258-
<a href="manual-git.html">Git hands-on session</a>
258+
<a href="manual-git-desktop.html">Git hands-on session using Github Desktop</a>
259+
</li>
260+
<li>
261+
<a href="manual-git-rstudio.html">Git hands-on session using Rstudio</a>
262+
</li>
263+
<li>
264+
<a href="manual-git-cmd.html">Git hands-on session using the command line</a>
259265
</li>
260266
<li>
261267
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
@@ -698,7 +704,7 @@ <h2>RMarkdown</h2>
698704
(function () {
699705
var script = document.createElement("script");
700706
script.type = "text/javascript";
701-
script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
707+
script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
702708
document.getElementsByTagName("head")[0].appendChild(script);
703709
})();
704710
</script>

docs/development-styleguide-repos.html

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<head>
66

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

@@ -255,7 +255,13 @@
255255
</a>
256256
<ul class="dropdown-menu" role="menu">
257257
<li>
258-
<a href="manual-git.html">Git hands-on session</a>
258+
<a href="manual-git-desktop.html">Git hands-on session using Github Desktop</a>
259+
</li>
260+
<li>
261+
<a href="manual-git-rstudio.html">Git hands-on session using Rstudio</a>
262+
</li>
263+
<li>
264+
<a href="manual-git-cmd.html">Git hands-on session using the command line</a>
259265
</li>
260266
<li>
261267
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
@@ -325,7 +331,7 @@ <h2>READMEs</h2>
325331
(function () {
326332
var script = document.createElement("script");
327333
script.type = "text/javascript";
328-
script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
334+
script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
329335
document.getElementsByTagName("head")[0].appendChild(script);
330336
})();
331337
</script>

docs/index.html

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<head>
66

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

@@ -255,7 +255,13 @@
255255
</a>
256256
<ul class="dropdown-menu" role="menu">
257257
<li>
258-
<a href="manual-git.html">Git hands-on session</a>
258+
<a href="manual-git-desktop.html">Git hands-on session using Github Desktop</a>
259+
</li>
260+
<li>
261+
<a href="manual-git-rstudio.html">Git hands-on session using Rstudio</a>
262+
</li>
263+
<li>
264+
<a href="manual-git-cmd.html">Git hands-on session using the command line</a>
259265
</li>
260266
<li>
261267
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
@@ -313,7 +319,7 @@ <h1 class="title toc-ignore">INBO Tutorials</h1>
313319
(function () {
314320
var script = document.createElement("script");
315321
script.type = "text/javascript";
316-
script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
322+
script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
317323
document.getElementsByTagName("head")[0].appendChild(script);
318324
})();
319325
</script>

docs/installation-R-admin.html

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<head>
66

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

@@ -255,7 +255,13 @@
255255
</a>
256256
<ul class="dropdown-menu" role="menu">
257257
<li>
258-
<a href="manual-git.html">Git hands-on session</a>
258+
<a href="manual-git-desktop.html">Git hands-on session using Github Desktop</a>
259+
</li>
260+
<li>
261+
<a href="manual-git-rstudio.html">Git hands-on session using Rstudio</a>
262+
</li>
263+
<li>
264+
<a href="manual-git-cmd.html">Git hands-on session using the command line</a>
259265
</li>
260266
<li>
261267
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
@@ -434,7 +440,7 @@ <h2>Ubuntu</h2>
434440
(function () {
435441
var script = document.createElement("script");
436442
script.type = "text/javascript";
437-
script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
443+
script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
438444
document.getElementsByTagName("head")[0].appendChild(script);
439445
})();
440446
</script>

docs/installation-R-user.html

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<head>
66

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

@@ -255,7 +255,13 @@
255255
</a>
256256
<ul class="dropdown-menu" role="menu">
257257
<li>
258-
<a href="manual-git.html">Git hands-on session</a>
258+
<a href="manual-git-desktop.html">Git hands-on session using Github Desktop</a>
259+
</li>
260+
<li>
261+
<a href="manual-git-rstudio.html">Git hands-on session using Rstudio</a>
262+
</li>
263+
<li>
264+
<a href="manual-git-cmd.html">Git hands-on session using the command line</a>
259265
</li>
260266
<li>
261267
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
@@ -344,7 +350,7 @@ <h3>Linux</h3>
344350
(function () {
345351
var script = document.createElement("script");
346352
script.type = "text/javascript";
347-
script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
353+
script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
348354
document.getElementsByTagName("head")[0].appendChild(script);
349355
})();
350356
</script>

docs/installation-RStudio-admin.html

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<head>
66

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

@@ -255,7 +255,13 @@
255255
</a>
256256
<ul class="dropdown-menu" role="menu">
257257
<li>
258-
<a href="manual-git.html">Git hands-on session</a>
258+
<a href="manual-git-desktop.html">Git hands-on session using Github Desktop</a>
259+
</li>
260+
<li>
261+
<a href="manual-git-rstudio.html">Git hands-on session using Rstudio</a>
262+
</li>
263+
<li>
264+
<a href="manual-git-cmd.html">Git hands-on session using the command line</a>
259265
</li>
260266
<li>
261267
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
@@ -336,7 +342,7 @@ <h3>Afwijkingen t.o.v. default installatie</h3>
336342
(function () {
337343
var script = document.createElement("script");
338344
script.type = "text/javascript";
339-
script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
345+
script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
340346
document.getElementsByTagName("head")[0].appendChild(script);
341347
})();
342348
</script>

0 commit comments

Comments
 (0)