expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-12-13 17:37:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

troggle and git installation

Browse Source
This commit is contained in:
Philip Sargent
2021-10-24 00:40:12 +03:00
parent 7ab44fec6d
commit 9e98d24bb6
4 changed files with 105 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Handbook placeholder page</title>
<title>Handbook - Git Quick</title>
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head>
<body>
@@ -17,6 +17,8 @@
<p>You can read or clone these repos without any control, but to write ("push") to them you will need to use <var>ssh://expo@expo.survex.com</var> and set up the <a href="keyexchange.html">key exchange</a>.</p>
<p>NOTE: always use user <var>'expo'</var> as the login user (<var>ssh://expo@...</var>) even though within git you will be identified by your own ssh key name.</p>
<p>Brendan wrote a guide to using git for expo on a Windows machine. It's worth reading: <a href="/expofiles/documents/idiots-guide-expo-git.pdf">Idiots guide to accessing expo git.pdf</a>.
<p>Open a terminal in a new directory, e.g. /tmp/experiments/ in which you want to create the repo. It will automatically create a folder with the repo name e.g.'troggle' in that directory.</p>
<dl>
@@ -30,6 +32,14 @@
</dl>
<h3>Using git</h3>
<p>In Git, there are five places your source can exist: <ul>
<li>a stash,
<li>your local working directory,
<li>an index (or staging area),
<li>a local repository,
<li>and a remote repository.
</ul>
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>
<ul>

1
handbook/computing/winlaptop.html
View File

@@ -41,6 +41,7 @@
<p>Most Windows software that we recommend "just works" if you have set up PuTTy and have done the <a href="keyexchange.html">key-pair setup</a> and are running a local ssh agent (pagent) automatically at boot up on your laptop.
<p>Some software, such as the commercial (but free) GitKraken, requires that you click a checkbox to say that you are "using local SSH agent" rather than specifying ssh private keys explicitly (File->Preferences->Authentication in GitKraken).
<p>Some software (such as Filezilla) defaults to using the local agent and it "just works".
<p>Brendan wrote a guide to using putty and git for expo on a Windows machine. It's worth reading and it has lots of screenshots: <a href="/expofiles/documents/idiots-guide-expo-git.pdf">Idiots guide to accessing expo git.pdf</a>.
<h3 id="problems">Things that cause problems</h3>