Skip to content

Commit 5d480fb

Browse files
committed
docs: Update link data
1 parent 4667493 commit 5d480fb

File tree

7 files changed

+48
-48
lines changed

7 files changed

+48
-48
lines changed

02-getting-ready.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ There are many of them including:
4545

4646
| Image | Description |
4747
|----------------------------------------------------| ---- |
48-
| ![](./assets/pasted-image-20240216111739.png]] | This is the user account, followed by the computer name and separated by an `@`<br><br>Literally: *User **at** Computer*<br> |
49-
| ![](./assets/pasted-image-20240216111840.png]] | Tells us that we are running in MinGW 64 bit<br> |
50-
| ![](./assets/pasted-image-20240216111909.png]] | Shows we are in the `~/Source/Repos` folder, where `~` is the user's (your) home folder.<br><br>In Windows terms, this is the same as:<br><br> `C:\Users\UserName\Source\Repos`<br> |
48+
| ![](./assets/pasted-image-20240216111739.png) | This is the user account, followed by the computer name and separated by an `@`<br><br>Literally: *User **at** Computer*<br> |
49+
| ![](./assets/pasted-image-20240216111840.png) | Tells us that we are running in MinGW 64 bit<br> |
50+
| ![](./assets/pasted-image-20240216111909.png) | Shows we are in the `~/Source/Repos` folder, where `~` is the user's (your) home folder.<br><br>In Windows terms, this is the same as:<br><br> `C:\Users\UserName\Source\Repos`<br> |
5151

5252
## Setting up Microsoft Terminal to use Git Bash as a CLI
5353

@@ -57,52 +57,52 @@ Click on the `v` (or press `CTRL`+`,`) on the tab bar.
5757

5858
Click *Settings*...
5959

60-
![](./assets/pasted-image-20240216103325.png]]
60+
![](./assets/pasted-image-20240216103325.png)
6161

6262
Click on *Add a new profile*...
6363

64-
![](./assets/pasted-image-20240216103615.png]]
64+
![](./assets/pasted-image-20240216103615.png)
6565

6666
Click *New Empty Profile*...
6767

68-
![](./assets/pasted-image-20240216103644.png]]
68+
![](./assets/pasted-image-20240216103644.png)
6969

7070
Click on the `v` next to the "*Profile x*"...
7171

72-
![](./assets/pasted-image-20240216103947.png]]
72+
![](./assets/pasted-image-20240216103947.png)
7373

7474
And give the profile a name...
7575

76-
![](./assets/pasted-image-20240216103833.png]]
76+
![](./assets/pasted-image-20240216103833.png)
7777

7878
Next find the *Command Line* entry and click on the `v`
7979

80-
![](./assets/pasted-image-20240216104034.png]]
80+
![](./assets/pasted-image-20240216104034.png)
8181

8282
Then click the *Browse* button...
8383

84-
![](./assets/pasted-image-20240216104105.png]]
84+
![](./assets/pasted-image-20240216104105.png)
8585

8686
At home, if you have installed using Git-SCM installer then the default location for Git is: `c:\program files\git`. If you have Laragon installed using the default installation location, then you should find Git in the `C:\Laragon\bin\git` folder.
8787

8888
> At TAFE, we have a different location, `c:\ProgramData\git` or even `C:\ProgramData\Laragon\bin\git`.
8989
9090
Use the browse to locate the folder and find either the `git.exe` or the `bash.exe` file in the `bin` folder.
9191

92-
![](./assets/pasted-image-20240216105026.png]]
92+
![](./assets/pasted-image-20240216105026.png)
9393

9494
Click on the Starting Directory `v` and then untick the "*Use parent process directory*"...
9595

96-
![](./assets/pasted-image-20240216105847.png]]
96+
![](./assets/pasted-image-20240216105847.png)
9797
This should then show `%USERPROFILE%` in a text field and `Browse` button underneath...
9898

99-
![](./assets/pasted-image-20240216105903.png]]
99+
![](./assets/pasted-image-20240216105903.png)
100100

101101
No matter what is shown, clear the content and enter the following in its place...
102102

103103
`%USERPROFILE%\Source\Repos`
104104

105-
![](./assets/pasted-image-20240216110033.png]]
105+
![](./assets/pasted-image-20240216110033.png)
106106

107107
Click `SAVE` to save the changes
108108

@@ -115,21 +115,21 @@ The steps below are optional, and you may vary to your own "taste".
115115

116116
Click the *Appearance* item.
117117

118-
![](./assets/pasted-image-20240216110837.png]]
118+
![](./assets/pasted-image-20240216110837.png)
119119

120120
You may change the base colour scheme, the font face and more.
121121

122122
Here are the settings Adrian has for this terminal prompt:
123123

124-
![](./assets/pasted-image-20240216110957.png]]
124+
![](./assets/pasted-image-20240216110957.png)
125125

126126
Click Save then you can click the `X` next to settings to close the dialog.
127-
![](./assets/pasted-image-20240216111033.png]]
127+
![](./assets/pasted-image-20240216111033.png)
128128

129129
Finally you are able to open the new terminal by clicking on the `v` and selecting your custom terminal or using the short-cut it shows on the right next to your custom terminal.
130130

131-
![](./assets/pasted-image-20240216111111.png]]
131+
![](./assets/pasted-image-20240216111111.png)
132132

133133
You will now have your terminal open and ready:
134134

135-
![](./assets/pasted-image-20240216111239.png]]
135+
![](./assets/pasted-image-20240216111239.png)

03-repositories-and-folders.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Open Terminal and then click the `v` next to the `+` on the tab bar.
1212

1313
Select the *Command Prompt* option
1414

15-
![[pasted-image-20240216105215.png]]
15+
![[pasted-image-20240216105215.png)
1616

1717
When the terminal opens use the following commands to change into your "user home" and make the `Source\Repos` folder.
1818

04-git-started.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Use `mkdir` command to create the folder, change into the new folder, and then u
1313
Let's presume the new project will be in the `Duck-Rogers` folder.
1414

1515
Use the `pwd` command to verify the folder:
16-
![[pasted-image-20240216113101.png]]
16+
![[pasted-image-20240216113101.png)
1717

1818
You see that the Windows `\` have been reversed to `/` and the `:` removed.
1919

@@ -23,7 +23,7 @@ cd Duck-Rogers
2323
git init .
2424
```
2525

26-
![[pasted-image-20240216113320.png]]
26+
![[pasted-image-20240216113320.png)
2727

2828
The command prompt will now show either `(master)` or `(main)` - if it is `master`, we will show you later how to (a) change it to `main` for the current project and (b) to make `main` the default.
2929

@@ -36,28 +36,28 @@ git init Duck-Rogers
3636
cd Duck-Rogers
3737
```
3838

39-
![[pasted-image-20240216113649.png]]
39+
![[pasted-image-20240216113649.png)
4040

41-
![[pasted-image-20240216113804.png]]
41+
![[pasted-image-20240216113804.png)
4242

4343
### Option 3: Initialise project with existing files
4444

4545
The best part of this is that you are basically able to use the previous options, except the folder already exists.
4646

4747
For example, if `Duck-Rogers` already exist and has files, then, if we are at the parent folder for Duck-Rogers we can use the `git init Duck-Rogers` command.
4848

49-
![[pasted-image-20240216114404.png]]
49+
![[pasted-image-20240216114404.png)
5050

5151
If you are in the `Duck-Rogers` folder and there are files in the folder then using the `git init .` command will do the same thing.
5252

53-
![[pasted-image-20240216114456.png]]
53+
![[pasted-image-20240216114456.png)
5454

5555

5656
## Verify Repository was Created
5757

5858
To check it is created we use the `ls -la` command:
5959

60-
![[pasted-image-20240216113831.png]]
60+
![[pasted-image-20240216113831.png)
6161

6262
Notice the last line. The `d` at the start tells you it is a folder (directory), and its name is `.git`. It is a hidden folder.
6363

05-global-settings.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ git config --global user.email "YOUR EMAIL ADDRESS"
1515

1616
The `--global` indicates that the changes are stored for this and all future projects.
1717

18-
![[pasted-image-20240216124422.png]]
18+
![[pasted-image-20240216124422.png)
1919

2020
To see the global settings...
2121
```shell
2222
git config --list --global
2323
```
2424

25-
![[pasted-image-20240216124543.png]]
25+
![[pasted-image-20240216124543.png)
2626

2727
### Per Project Configuration
2828

@@ -47,7 +47,7 @@ git config user.email "[email protected]"
4747

4848
The `--global` indicates that the changes are stored for this and all future projects.
4949

50-
![[pasted-image-20240216124422.png]]
50+
![[pasted-image-20240216124422.png)
5151

5252

5353
### Default "Branch" name to Main...
@@ -64,7 +64,7 @@ To change the current 'master branch' to be the 'main branch' we need to do the
6464
git branch -m master main
6565
```
6666

67-
![[pasted-image-20240216125018.png]]
67+
![[pasted-image-20240216125018.png)
6868

6969

7070

@@ -91,11 +91,11 @@ git config --global core.editor "notepad"
9191
9292
Now when you enter `git commit` the Notepad editor will open. The command line will tell you it is waiting for the editor to close a file (`COMMIT_MESSAGE`).
9393

94-
![[pasted-image-20240223102507.png]]
94+
![[pasted-image-20240223102507.png)
9595

9696
When Notepad is opened, it will show a set of comments that tell you details about the added files as comments.
9797

98-
![[pasted-image-20240223102034.png]]
98+
![[pasted-image-20240223102034.png)
9999

100100
Now editing the commit message and adding the details that may be more than just a one liner is easy.
101101

08-status-add-commit.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Checking the status of the repository is done using the `git status` command:
55
```shell
66
git status
77
```
8-
![[pasted-image-20240216121457.png]]
8+
![[pasted-image-20240216121457.png)
99

1010
In this example, we have two files that are not "tracked" by the repository.
1111

@@ -18,19 +18,19 @@ To add a file to be tracked we use `git add FILENAME`. For example:
1818
```shell
1919
git add ReadMe.md
2020
```
21-
![[pasted-image-20240216121921.png]]
21+
![[pasted-image-20240216121921.png)
2222

2323
Checking the status after adding shows:
2424

25-
![[pasted-image-20240216122006.png]]
25+
![[pasted-image-20240216122006.png)
2626

2727
Once a file is tracked, any time you make changes and are happy with them, you should perform a `git status` and then `git add` the changed file.
2828

29-
![[pasted-image-20240216122531.png]]
29+
![[pasted-image-20240216122531.png)
3030

3131
Here you see the file has been modified.
3232

33-
![[pasted-image-20240216122620.png]]
33+
![[pasted-image-20240216122620.png)
3434

3535
After adding the changes, we see it is back to 'new'.
3636

@@ -46,11 +46,11 @@ git commit -m "Commit message"
4646

4747
In the above line the `-m` indicates that we are including a message.
4848

49-
![[pasted-image-20240216122842.png]]
49+
![[pasted-image-20240216122842.png)
5050

5151
Now our `git status` should show:
5252

53-
![[pasted-image-20240216123105.png]]
53+
![[pasted-image-20240216123105.png)
5454

5555
The committed file is still tracked, but as no changes have been made it does not show.
5656

@@ -74,15 +74,15 @@ Save the changes, then check the status of the repository.
7474

7575
It should show the `ReadMe.md` has changed:
7676

77-
![[pasted-image-20240216123506.png]]
77+
![[pasted-image-20240216123506.png)
7878

7979
**Add** the changes to the repo and **commit** them using the message:
8080

8181
```text
8282
feat(readme): Update ReadMe.md to include author and version
8383
```
8484

85-
![[pasted-image-20240216123759.png]]
85+
![[pasted-image-20240216123759.png)
8686

8787

8888

@@ -99,4 +99,4 @@ The easiest way out is to do the following:
9999

100100
- **Option 2:** Press **`ESCAPE`**, then press and hold the **`SHIFT`** whilst typing **`Z`** twice - This is a save and quit
101101

102-
![[pasted-image-20240216125345.png]]
102+
![[pasted-image-20240216125345.png)

09-git-history.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ To see the history of the project so far we use...
66
```bash
77
git log
88
```
9-
![[pasted-image-20240216123842.png]]
9+
![[pasted-image-20240216123842.png)
1010

1111
> **Note:** The history is shown in reverse order... newest first.
1212
@@ -17,6 +17,6 @@ git log --oneline
1717
```
1818

1919
Which produces a shorthand version of the log:
20-
![[pasted-image-20240223100556.png]]
20+
![[pasted-image-20240223100556.png)
2121

2222
What is important is that the message shows in this log. It is a good idea *not* to have a very long first line to a commit message.

11-merging-and-conflicts.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ To resolve this we need to edit the file(s) with the errors and fix the changes
2525

2626
The image below shows the conflict being reported.
2727

28-
![[pasted-image-20240223114440.png]]
28+
![[pasted-image-20240223114440.png)
2929

3030
To resolve the conflicts you now edit the file (or files) with the conflicts.
3131

@@ -59,8 +59,8 @@ git commit -m "MERGE SUMMARY MESSAGE"
5959

6060
The image below shows a really bad commit message:
6161

62-
![[pasted-image-20240223115404.png]]
62+
![[pasted-image-20240223115404.png)
6363

6464
If we now log the commits we will see a diagram of the branches with the conflict shown in red:
6565

66-
![[pasted-image-20240223115456.png]]
66+
![[pasted-image-20240223115456.png)

0 commit comments

Comments
 (0)