expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-21 23:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

5-places git locations

Browse Source
This commit is contained in:
Philip Sargent 2023-03-14 20:57:31 +00:00 committed by Wookey
parent 682c8f75c3
commit e857b12a29
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
handbook/computing/git-5-places.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

13
handbook/computing/qstart-git.html
View File

@ -51,13 +51,22 @@ gives a nice linear log rather than trivial merges.
<p>In VS code there is a "Pull (rebase)" command accessed from the "Push, Pull" option in the pull-down menu "..." in the <small>SOURCE CONTROL</small> window. Use that instead of the "Pull" option which is more obvious.
<h3>Using git</h3>
<p>In Git, there are five places your source can exist: <ul>
<figure class="onright">
<a href="https://merrigrove.blogspot.com/2014/02/why-heck-is-git-so-hard-places-model-ok.html">
<img width=350 src="git-5-places.jpg"></a>
<figcaption>
<em>The 5 places you code can live (click for more)</em>
</figcaption>
</figure>
<p>In Git, there are five places your source can exist: <ol>
<li>a stash,
<li>your local working directory,
<li>an index (or staging area),
<li>a local repository,
<li>and a remote repository.
</ul>
</ol>
Knowing that these places even <em>exist</em> is often the first conceptual impediment.
<p><a href="https://stevebennett.me/2012/02/24/10-things-i-hate-about-git/"><img class="onright" src="git-arrows31.png" alt="git bread &amp; butter commands subset" width="250" /></a>You may find these useful:</p>
<ul>