Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • sc/edu/git-seminar
  • mk21womu/git-seminar
2 results
Select Git revision
Show changes
Commits on Source (39)
Showing
with 512 additions and 232 deletions
paper.html
paper.pdf
img/git-remote-contributor.svg img/git-remote-contributor.svg
img/git-remote-maintainer.svg img/git-remote-maintainer.svg
img/git-remote-solo.svg img/git-remote-solo.svg
img/license-chooser.svg img/license-chooser.svg
img/motivation-structure.svg
img/motivation-throwaway-playground.svg img/motivation-throwaway-playground.svg
img/rdm-use-case-data.svg
img/rdm-use-cases-a.svg
img/rdm-use-cases-b.svg
img/rdm-use-cases.svg
img/staging-area.svg img/staging-area.svg
paper.html
paper.pdf
*.pdf *.pdf
img/staging-area-diff.svg
/img/rdm-use-case-merged.svg
[submodule "reveal.js"] [submodule "reveal.js"]
path = reveal.js path = reveal.js
url = https://github.com/hakimel/reveal.js.git url = https://github.com/hakimel/reveal.js.git
[submodule "pandoc-cheat-sheet"]
path = pandoc-cheat-sheet
url = https://github.com/idiv-biodiversity/pandoc-cheat-sheet.git
...@@ -17,12 +17,22 @@ pandoc-papers.pdf: pandoc-papers.md ...@@ -17,12 +17,22 @@ pandoc-papers.pdf: pandoc-papers.md
-o pandoc-papers.pdf \ -o pandoc-papers.pdf \
pandoc-papers.md pandoc-papers.md
rdm.pdf: img rdm.md rdm.yml
pandoc \
--standalone \
--from=markdown+yaml_metadata_block \
--pdf-engine=xelatex \
--template=pandoc-cheat-sheet/cheat-sheet.tex \
-o rdm.pdf \
rdm.yml rdm.md
all: subdirs all: subdirs
clean: clean:
for dir in $(SUBDIRS); do \ for dir in $(SUBDIRS); do \
$(MAKE) -C $$dir $@; \ $(MAKE) -C $$dir $@; \
done done
rm -f rdm.pdf
default: all default: all
......
# regular FAQ
- 10-12 git integration RStudio / VS Code / others
- 13-15 GitLab / GitHub project setup / importing existing projects / how to start and continue after that, project management, issue management
- 15-16 GitLab / GitHub automation
- 16-18 free for all
# git advanced -- how to maintain a comprehensible history # git advanced -- how to maintain a comprehensible history
- when projects get bigger - when projects get bigger
......
This diff is collapsed.
...@@ -6,7 +6,7 @@ digraph { ...@@ -6,7 +6,7 @@ digraph {
node [color = orchid] node [color = orchid]
omaster[label = "master"] omain[label = "main"]
} }
subgraph clusterlocal { subgraph clusterlocal {
...@@ -14,7 +14,7 @@ digraph { ...@@ -14,7 +14,7 @@ digraph {
node [color = orchid] node [color = orchid]
master[label = "master"] main[label = "main"]
} }
subgraph clusterupstream { subgraph clusterupstream {
...@@ -22,11 +22,11 @@ digraph { ...@@ -22,11 +22,11 @@ digraph {
node [color = limegreen] node [color = limegreen]
umaster[label = "master"] umain[label = "main"]
} }
omaster -> master [label = "git pull"] omain -> main [label = "git pull"]
master -> omaster [label = "git push", constraint = false] main -> omain [label = "git push", constraint = false]
umaster -> master [label = "git pull upstream master", constraint = false] umain -> main [label = "git pull upstream main", constraint = false]
omaster -> umaster [label = "pull request (GitHub)\nmerge request (GitLab)", constraint = false] omain -> umain [label = "pull request (GitHub)\nmerge request (GitLab)", constraint = false]
} }
...@@ -6,7 +6,7 @@ digraph { ...@@ -6,7 +6,7 @@ digraph {
node [color = orchid] node [color = orchid]
omaster[label = "master"] omain[label = "main"]
} }
subgraph clusterlocal { subgraph clusterlocal {
...@@ -14,7 +14,7 @@ digraph { ...@@ -14,7 +14,7 @@ digraph {
node [color = orchid] node [color = orchid]
master[label = "master"] main[label = "main"]
} }
subgraph clusteralice { subgraph clusteralice {
...@@ -22,7 +22,7 @@ digraph { ...@@ -22,7 +22,7 @@ digraph {
node [color = limegreen] node [color = limegreen]
amaster[label = "master"] amain[label = "main"]
} }
subgraph clusterbob { subgraph clusterbob {
...@@ -30,11 +30,11 @@ digraph { ...@@ -30,11 +30,11 @@ digraph {
node [color = lightskyblue] node [color = lightskyblue]
bmaster[label = "master"] bmain[label = "main"]
} }
omaster -> master [label = "git pull"] omain -> main [label = "git pull"]
master -> omaster [label = "git push", constraint = false] main -> omain [label = "git push", constraint = false]
amaster -> master [label = "git pull alice", constraint = false] amain -> main [label = "git pull alice", constraint = false]
bmaster -> master [label = "git pull bob", constraint = false] bmain -> main [label = "git pull bob", constraint = false]
} }
...@@ -9,7 +9,7 @@ digraph { ...@@ -9,7 +9,7 @@ digraph {
node [color = orchid] node [color = orchid]
omaster[label = "master"] omain[label = "main"]
} }
subgraph clusterlocal { subgraph clusterlocal {
...@@ -17,10 +17,10 @@ digraph { ...@@ -17,10 +17,10 @@ digraph {
node [color = orchid] node [color = orchid]
master[label = "master"] main[label = "main"]
} }
omaster -> master [label = "git fetch", style = dotted, ltail = clusterorigin, lhead = clusterlocal] omain -> main [label = "git fetch", style = dotted, ltail = clusterorigin, lhead = clusterlocal]
master -> omaster [label = "git push"] main -> omain [label = "git push"]
omaster -> master [label = "git pull"] omain -> main [label = "git pull"]
} }
File moved
digraph {
node [shape = "box", style = "filled, rounded"]
master4[label = "Alice (today)\nfixes logic error", color = limegreen]
master3[label = "Bob (yesterday)\nfixes typos", color = darkorchid1]
master2[label = "Alice (three days ago)\nadds methods chapter", color = limegreen]
master1[label = "...", color = grey]
master4 -> master3 -> master2 -> master1
}
digraph { digraph {
node [shape = "box", style = "filled, rounded"] node [shape = "box", style = "filled, rounded"]
subgraph clustermaster { subgraph clustermain {
label = "master" label = "main"
node [color = limegreen] node [color = limegreen]
master3[label = "ebe0262"] main3[label = "..."]
master2[label = "03f4f8d"] main2[label = "..."]
master1[label = "62a0ee9"] main1[label = "..."]
master3 -> master2 -> master1 main3 -> main2 -> main1
} }
subgraph clusterplayground { subgraph clusterplayground {
...@@ -18,11 +18,11 @@ digraph { ...@@ -18,11 +18,11 @@ digraph {
node [color = orchid] node [color = orchid]
playground2[label = "8b29f74"] playground2[label = "visualization"]
playground1[label = "7f295dd"] playground1[label = "methods"]
playground2 -> playground1 playground2 -> playground1
} }
playground1 -> master2 playground1 -> main2
} }
digraph {
compound = true
node [shape = "box", style = "filled, rounded"]
subgraph cluster_script {
label = "scripts"
node [color = lightskyblue]
script_version_b[label = "nature-v2"]
}
subgraph cluster_data {
label = "data repository (not git!)"
node [color = limegreen]
data_version_a[label = "doi:blah/blah"]
}
subgraph cluster_paper {
label = "paper"
node [color = limegreen]
paper_version_c[label = "nature-final"]
}
paper_version_c -> data_version_a [label = "\n\n", lhead = cluster_data]
data_version_a -> script_version_b [label = "\n\n", lhead = cluster_script]
}
digraph {
compound = true
node [shape = "box", style = "filled, rounded"]
subgraph cluster_script {
label = "scripts"
node [color = lightskyblue]
script_version_b[label = "nature-v2"]
script_version_a[label = "nature-v1"]
}
subgraph cluster_data {
label = "data repository (not git!)"
node [color = limegreen]
data_version_a[label = "doi:blah/blah"]
}
subgraph cluster_paper {
label = "paper"
node [color = limegreen]
paper_version_a[label = "nature-review-1"]
paper_version_b[label = "nature-review-2"]
paper_version_c[label = "nature-final"]
}
subgraph cluster_software_a {
label = "software A"
node [color = orchid]
software_a_version_a[label = "v2.1.6"]
}
subgraph cluster_software_b {
label = "software B"
node [color = orchid]
software_b_version_b[label = "v0.3.4"]
software_b_version_a[label = "v0.2.0"]
}
script_version_a -> software_a_version_a [label = "\n\n"]
script_version_b -> software_a_version_a [label = "\n\n"]
script_version_a -> software_b_version_a [label = "\n\n"]
script_version_b -> software_b_version_b [label = "\n\n"]
paper_version_a -> script_version_a [label = "\n\n"]
paper_version_b -> script_version_b [label = "\n\n"]
paper_version_c -> script_version_b [label = "\n\n"]
paper_version_c -> data_version_a [label = "\n\n"]
data_version_a -> script_version_b [label = "\n\n"]
}
digraph {
compound = true
node [shape = "box", style = "filled, rounded"]
subgraph cluster_software_a {
label = "software A"
node [color = orchid]
software_a_version_a[label = "v2.1.6"]
}
subgraph cluster_software_b {
label = "software B"
node [color = orchid]
software_b_version_a[label = "v0.2.0"]
}
subgraph cluster_script {
label = "scripts"
node [color = lightskyblue]
script_version_a[label = "nature-v1"]
}
subgraph cluster_paper {
label = "paper"
node [color = limegreen]
paper_version_a[label = "nature-review-1"]
}
script_version_a -> software_a_version_a [label = "\n\n"]
script_version_a -> software_b_version_a [label = "\n\n"]
paper_version_a -> script_version_a [label = "\n\n"]
}
digraph {
compound = true
node [shape = "box", style = "filled, rounded"]
subgraph cluster_software_a {
label = "software A"
node [color = orchid]
software_a_version_a[label = "v2.1.6"]
}
subgraph cluster_software_b {
label = "software B"
node [color = orchid]
software_b_version_b[label = "v0.3.4"]
software_b_version_a[label = "v0.2.0"]
}
subgraph cluster_script {
label = "scripts"
node [color = lightskyblue]
script_version_b[label = "nature-v2"]
script_version_a[label = "nature-v1"]
}
subgraph cluster_paper {
label = "paper"
node [color = limegreen]
paper_version_a[label = "nature-review-1"]
paper_version_b[label = "nature-review-2"]
}
script_version_a -> software_a_version_a [label = "\n\n"]
script_version_b -> software_a_version_a [label = "\n\n"]
script_version_a -> software_b_version_a [label = "\n\n"]
script_version_b -> software_b_version_b [label = "\n\n"]
paper_version_a -> script_version_a [label = "\n\n"]
paper_version_b -> script_version_b [label = "\n\n"]
}
digraph {
compound = true
node [shape = "box", style = "filled, rounded"]
subgraph cluster_software_a {
label = "software A"
node [color = orchid]
software_a_version_a[label = "v2.1.6"]
}
subgraph cluster_software_b {
label = "software B"
node [color = orchid]
software_b_version_b[label = "v0.3.4"]
software_b_version_a[label = "v0.2.0"]
}
subgraph cluster_script {
label = "scripts"
node [color = lightskyblue]
script_version_b[label = "nature-v2"]
script_version_a[label = "nature-v1"]
}
subgraph cluster_paper {
label = "paper"
node [color = limegreen]
paper_version_a[label = "nature-review-1"]
paper_version_b[label = "nature-review-2"]
paper_version_c[label = "nature-final"]
}
script_version_a -> software_a_version_a [label = "\n\n"]
script_version_b -> software_a_version_a [label = "\n\n"]
script_version_a -> software_b_version_a [label = "\n\n"]
script_version_b -> software_b_version_b [label = "\n\n"]
paper_version_a -> script_version_a [label = "\n\n"]
paper_version_b -> script_version_b [label = "\n\n"]
paper_version_c -> script_version_b [label = "\n\n"]
}
digraph {
node [shape = "box", style = "filled,rounded"]
workdir[label = "working directory\n(changes not staged for commit)", color = lightskyblue]
stage[label = "staging area\n(changes to be committed)", color = orchid]
repo[label = "repository\n(tracked content)", color = limegreen]
workdir -> stage [label = "git diff"]
stage -> repo [label = "git diff --staged"]
}
img/unlimited-power.jpg

54.9 KiB

Subproject commit 2346a002289757ee612bfd4b56b57db53e0c751b