diff --git a/handbook/computing/git-arrows31.png b/handbook/computing/git-arrows31.png new file mode 100644 index 000000000..784715c67 Binary files /dev/null and b/handbook/computing/git-arrows31.png differ diff --git a/handbook/computing/gitcontentmodel.jpg b/handbook/computing/gitcontentmodel.jpg new file mode 100644 index 000000000..41b057f0c Binary files /dev/null and b/handbook/computing/gitcontentmodel.jpg differ diff --git a/handbook/computing/qstart-git.html b/handbook/computing/qstart-git.html index cfb6e768e..8a3adf348 100644 --- a/handbook/computing/qstart-git.html +++ b/handbook/computing/qstart-git.html @@ -10,8 +10,8 @@

Quick Reminder - Git

Version Control Software Reminders

+git content model

This is NOT a tutorial. This is a set of reminders for people who already know all this stuff. -

Since 2019 all use of version control software requires that you have key-pair setup already set up before any of this will work on your own machine. @@ -42,24 +42,39 @@ have key-pair setup already set up before any of git clone ssh://expo@expo.survex.com:/home/expo/drawings (read/write)
+ +

Using git

+

+ +git bread & butter commands subsetYou may find these useful: +

Using git in Windows

+

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. +

"Git is a 4 handle, dual boiler espresso machine – when all you need is instant."

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:

-

git clone ssh://expo@expo.survex.com:/home/expo/expoweb

+

git clone ssh://expo@expo.survex.com:/home/expo/expoweb

for subsequent updates

-

git update

+

git update

will generally do the trick.

After you've made a change, commit it to you local copy with:

-

git commit (you can specify filenames to be specific)

+

git commit (you can specify filenames to be specific)

-

The first time you do this on a Windows machineit will probably not work as it does not recognise the server key echnage. +

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 https://www.chiark.greenend.org.uk/~sgtatham/putty/), 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.

diff --git a/years/2010/accounts/splits/breakdown b/years/2010/accounts/splits/breakdown deleted file mode 120000 index 80d1bf90d..000000000 --- a/years/2010/accounts/splits/breakdown +++ /dev/null @@ -1 +0,0 @@ -../split-by-days-on-expo \ No newline at end of file diff --git a/years/2010/accounts/splits/breakdown b/years/2010/accounts/splits/breakdown new file mode 100644 index 000000000..6e33559b0 --- /dev/null +++ b/years/2010/accounts/splits/breakdown @@ -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 + diff --git a/years/2010/accounts/splits/car-wear-and-tear b/years/2010/accounts/splits/car-wear-and-tear deleted file mode 120000 index 80d1bf90d..000000000 --- a/years/2010/accounts/splits/car-wear-and-tear +++ /dev/null @@ -1 +0,0 @@ -../split-by-days-on-expo \ No newline at end of file diff --git a/years/2010/accounts/splits/car-wear-and-tear b/years/2010/accounts/splits/car-wear-and-tear new file mode 100644 index 000000000..6e33559b0 --- /dev/null +++ b/years/2010/accounts/splits/car-wear-and-tear @@ -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 + diff --git a/years/2010/accounts/splits/food b/years/2010/accounts/splits/food deleted file mode 120000 index 80d1bf90d..000000000 --- a/years/2010/accounts/splits/food +++ /dev/null @@ -1 +0,0 @@ -../split-by-days-on-expo \ No newline at end of file diff --git a/years/2010/accounts/splits/food b/years/2010/accounts/splits/food new file mode 100644 index 000000000..6e33559b0 --- /dev/null +++ b/years/2010/accounts/splits/food @@ -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 + diff --git a/years/2010/accounts/splits/fuel-in-austria b/years/2010/accounts/splits/fuel-in-austria deleted file mode 120000 index 80d1bf90d..000000000 --- a/years/2010/accounts/splits/fuel-in-austria +++ /dev/null @@ -1 +0,0 @@ -../split-by-days-on-expo \ No newline at end of file diff --git a/years/2010/accounts/splits/fuel-in-austria b/years/2010/accounts/splits/fuel-in-austria new file mode 100644 index 000000000..6e33559b0 --- /dev/null +++ b/years/2010/accounts/splits/fuel-in-austria @@ -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 + diff --git a/years/2010/accounts/splits/spud-hut b/years/2010/accounts/splits/spud-hut deleted file mode 120000 index 80d1bf90d..000000000 --- a/years/2010/accounts/splits/spud-hut +++ /dev/null @@ -1 +0,0 @@ -../split-by-days-on-expo \ No newline at end of file diff --git a/years/2010/accounts/splits/spud-hut b/years/2010/accounts/splits/spud-hut new file mode 100644 index 000000000..6e33559b0 --- /dev/null +++ b/years/2010/accounts/splits/spud-hut @@ -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 + diff --git a/years/2010/accounts/splits/tackle b/years/2010/accounts/splits/tackle deleted file mode 120000 index 80d1bf90d..000000000 --- a/years/2010/accounts/splits/tackle +++ /dev/null @@ -1 +0,0 @@ -../split-by-days-on-expo \ No newline at end of file diff --git a/years/2010/accounts/splits/tackle b/years/2010/accounts/splits/tackle new file mode 100644 index 000000000..6e33559b0 --- /dev/null +++ b/years/2010/accounts/splits/tackle @@ -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 + diff --git a/years/2010/accounts/splits/vfho b/years/2010/accounts/splits/vfho deleted file mode 120000 index 80d1bf90d..000000000 --- a/years/2010/accounts/splits/vfho +++ /dev/null @@ -1 +0,0 @@ -../split-by-days-on-expo \ No newline at end of file diff --git a/years/2010/accounts/splits/vfho b/years/2010/accounts/splits/vfho new file mode 100644 index 000000000..6e33559b0 --- /dev/null +++ b/years/2010/accounts/splits/vfho @@ -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 +