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

move git aids

Browse Source
This commit is contained in:
Philip Sargent 2020-04-30 23:11:55 +01:00
parent 5993bf1a59
commit 479270f0c0
10 changed files with 104 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
handbook/computing/git-arrows31.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 143 KiB

BIN
handbook/computing/gitcontentmodel.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

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

@ -10,8 +10,8 @@
<h1>Quick Reminder - Git</h1>
<h2>Version Control Software Reminders</h2>
<a href="https://merrigrove.blogspot.com/2014/02/why-heck-is-git-so-hard-places-model-ok.html"><img class="onright" src="gitcontentmodel.jpg" alt="git content model" /></a>
<p>This is NOT a tutorial. This is a set of reminders for people who already know all this stuff.
<p>Since 2019 all use of version control software requires that you
have <a href="keyexchange.html">key-pair setup</a> already set up before any of this will work on your own machine.
@ -42,24 +42,39 @@ have <a href="keyexchange.html">key-pair setup</a> already set up before any of
<tt>git clone ssh://expo@expo.survex.com:/home/expo/drawings</tt> (read/write)<br />
</dd>
</dl>
<h3>Using git</h3>
<p>
<a href="https://stevebennett.me/2012/02/24/10-things-i-hate-about-git/"><img width="250"
class="onright" src="git-arrows31.png" alt="git bread & butter commands subset" /></a>You may find these useful:
<ul><ul>
<li><a href="https://ohshitgit.com/">Oh Shit, Git!?!</a>
<li><a href="https://learngitbranching.js.org/">Animated Git training</a>
<li><a href="https://merrigrove.blogspot.com/2014/02/why-heck-is-git-so-hard-places-model-ok.html">Why the Heck is Git so Hard?</a>
<li><a href="https://stevebennett.me/2012/02/24/10-things-i-hate-about-git/">10 things I hate about Git</a>
<li><a href="http://www.ndpsoftware.com/git-cheatsheet.html#loc=workspace;">git cheat sheet (clickable)</a>
</ul></ul>
<h3><a id="gitwindows">Using git in Windows</a></h3>
<p>Do not use the official "git for Windows" client software as it doesn't understand symlinks in the WSL filesystem we use on Windows. Use VS Code which understand WSL or a command line git in a WSL terminal window.
<p>"Git is a 4 handle, dual boiler espresso machine – when all you need is instant."
<p>Once you've downloaded and installed a git client, the first step is to create what is called a checkout of the data management system. This creates a copy on your machine which you can edit to your heart's content. The command to initially check out ('clone') the entire expo data management system is:</p>
<p><tt>git clone ssh://expo@expo.survex.com:/home/expo/expoweb</tt></p>
<p><code>git clone ssh://expo@expo.survex.com:/home/expo/expoweb</code></p>
<p>for subsequent updates</p>
<p><tt>git update</tt></p>
<p><code>git update</code></p>
<p>will generally do the trick.</p>
<p>After you've made a change, commit it to you local copy with:</p>
<p><tt>git commit</tt> (you can specify filenames to be specific)</p>
<p><code>git commit</code> (you can specify filenames to be specific)</p>
<p>The first time you do this on a Windows machineit will probably not work as it does not recognise the server key echnage.
<p>The first time you do this on a Windows machine it will probably not work as it does not recognise the server key exchange.
Fix this by running putty (downloading it from <a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/">https://www.chiark.greenend.org.uk/~sgtatham/putty/</a>), and connecting to the server 'expo@expo.survex.com' (on port 22). Confirm that this is the right server.
If you succeed in getting a shell prompt then ssh connection are working and git should be able to clone the repo, and send changes back.</p>

1
years/2010/accounts/splits/breakdown
View File

@ -1 +0,0 @@
../split-by-days-on-expo

12
years/2010/accounts/splits/breakdown Normal file
View File

@ -0,0 +1,12 @@
andrew-atkinson,14
juliet-morse,14
andy-chapman,21
becka-lawson,42
chris-densham,21
chris-smith,16
frank-tully,21
mark-shinwell,16
martin-green,16
martin-jahnke,21
neil-pacey,21

1
years/2010/accounts/splits/car-wear-and-tear
View File

@ -1 +0,0 @@
../split-by-days-on-expo

12
years/2010/accounts/splits/car-wear-and-tear Normal file
View File

@ -0,0 +1,12 @@
andrew-atkinson,14
juliet-morse,14
andy-chapman,21
becka-lawson,42
chris-densham,21
chris-smith,16
frank-tully,21
mark-shinwell,16
martin-green,16
martin-jahnke,21
neil-pacey,21

1
years/2010/accounts/splits/food
View File

@ -1 +0,0 @@
../split-by-days-on-expo

12
years/2010/accounts/splits/food Normal file
View File

@ -0,0 +1,12 @@
andrew-atkinson,14
juliet-morse,14
andy-chapman,21
becka-lawson,42
chris-densham,21
chris-smith,16
frank-tully,21
mark-shinwell,16
martin-green,16
martin-jahnke,21
neil-pacey,21

1
years/2010/accounts/splits/fuel-in-austria
View File

@ -1 +0,0 @@
../split-by-days-on-expo

12
years/2010/accounts/splits/fuel-in-austria Normal file
View File

@ -0,0 +1,12 @@
andrew-atkinson,14
juliet-morse,14
andy-chapman,21
becka-lawson,42
chris-densham,21
chris-smith,16
frank-tully,21
mark-shinwell,16
martin-green,16
martin-jahnke,21
neil-pacey,21

1
years/2010/accounts/splits/spud-hut
View File

@ -1 +0,0 @@
../split-by-days-on-expo

12
years/2010/accounts/splits/spud-hut Normal file
View File

@ -0,0 +1,12 @@
andrew-atkinson,14
juliet-morse,14
andy-chapman,21
becka-lawson,42
chris-densham,21
chris-smith,16
frank-tully,21
mark-shinwell,16
martin-green,16
martin-jahnke,21
neil-pacey,21

1
years/2010/accounts/splits/tackle
View File

@ -1 +0,0 @@
../split-by-days-on-expo

12
years/2010/accounts/splits/tackle Normal file
View File

@ -0,0 +1,12 @@
andrew-atkinson,14
juliet-morse,14
andy-chapman,21
becka-lawson,42
chris-densham,21
chris-smith,16
frank-tully,21
mark-shinwell,16
martin-green,16
martin-jahnke,21
neil-pacey,21

1
years/2010/accounts/splits/vfho
View File

@ -1 +0,0 @@
../split-by-days-on-expo

12
years/2010/accounts/splits/vfho Normal file
View File

@ -0,0 +1,12 @@
andrew-atkinson,14
juliet-morse,14
andy-chapman,21
becka-lawson,42
chris-densham,21
chris-smith,16
frank-tully,21
mark-shinwell,16
martin-green,16
martin-jahnke,21
neil-pacey,21