Skip to content

Commit

Permalink
Built site for gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
Quarto GHA Workflow Runner committed May 28, 2024
1 parent 7e33775 commit 2395429
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .nojekyll
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2e79cacc
7fb02dcb
5 changes: 5 additions & 0 deletions git/git_intro.html
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ <h2 id="toc-title">Table of contents</h2>
<li><a href="#file-staging-and-git-commit" id="toc-file-staging-and-git-commit" class="nav-link" data-scroll-target="#file-staging-and-git-commit"><span class="header-section-number">1.5</span> File staging and git commit</a></li>
<li><a href="#git-pushpull" id="toc-git-pushpull" class="nav-link" data-scroll-target="#git-pushpull"><span class="header-section-number">1.6</span> Git push/pull</a></li>
<li><a href="#git-merge-and-git-rebase" id="toc-git-merge-and-git-rebase" class="nav-link" data-scroll-target="#git-merge-and-git-rebase"><span class="header-section-number">1.7</span> Git merge and git rebase</a></li>
<li><a href="#git-cheetsheet" id="toc-git-cheetsheet" class="nav-link" data-scroll-target="#git-cheetsheet"><span class="header-section-number">1.8</span> Git Cheetsheet</a></li>
</ul>
</nav>
</div>
Expand Down Expand Up @@ -361,6 +362,10 @@ <h2 data-number="1.7" class="anchored" data-anchor-id="git-merge-and-git-rebase"
<div class="sourceCode" id="cb6"><pre class="sourceCode bash code-with-copy"><code class="sourceCode bash"><span id="cb6-1"><a href="#cb6-1" aria-hidden="true" tabindex="-1"></a><span class="fu">git</span> checkout my_new_feature</span>
<span id="cb6-2"><a href="#cb6-2" aria-hidden="true" tabindex="-1"></a><span class="fu">git</span> rebase main</span></code><button title="Copy to Clipboard" class="code-copy-button"><i class="bi"></i></button></pre></div>
<p>This will sort of re-write the project history by moving the feature branch to the “tip” of the main and create new commits in the original branch.</p>
</section>
<section id="git-cheetsheet" class="level2" data-number="1.8">
<h2 data-number="1.8" class="anchored" data-anchor-id="git-cheetsheet"><span class="header-section-number">1.8</span> Git Cheetsheet</h2>
<p><img src="https://cdn.masto.host/socialjvnsca/media_attachments/files/112/288/026/870/908/533/original/8cdf198fa52700f6.png" class="img-fluid" alt="A Git cheetsheet by Julia Evans"></p>


</section>
Expand Down
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">

<meta name="author" content="NBIS">
<meta name="dcterms.date" content="2024-05-23">
<meta name="dcterms.date" content="2024-05-28">

<title>Training: Tech shorts</title>
<style>
Expand Down Expand Up @@ -212,7 +212,7 @@ <h1 class="title">Training: Tech shorts</h1>
<div>
<div class="quarto-title-meta-heading">Published</div>
<div class="quarto-title-meta-contents">
<p class="date">May 23, 2024</p>
<p class="date">May 28, 2024</p>
</div>
</div>

Expand Down
11 changes: 11 additions & 0 deletions search.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,17 @@
"<span class='chapter-number'>1</span>  <span class='chapter-title'>Introduction to Git</span>"
]
},
{
"objectID": "git/git_intro.html#git-cheetsheet",
"href": "git/git_intro.html#git-cheetsheet",
"title": "1  Introduction to Git",
"section": "1.8 Git Cheetsheet",
"text": "1.8 Git Cheetsheet",
"crumbs": [
"Git",
"<span class='chapter-number'>1</span>  <span class='chapter-title'>Introduction to Git</span>"
]
},
{
"objectID": "github/gh-collaboration.html",
"href": "github/gh-collaboration.html",
Expand Down

0 comments on commit 2395429

Please sign in to comment.