Skip to content

Commit fc693be

Browse files
committed
Forgot to stage a few files
1 parent fef0ca4 commit fc693be

8 files changed

+61
-7
lines changed

database/sharding_and_partitioning.md

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Sharding and Partitioning
2+
3+
TODO make diagrams
4+
5+
## Resources and References
6+
7+
- [PlanetScale blobpost: "Sharding vs. partitioning: What’s the difference?"](https://planetscale.com/blog/sharding-vs-partitioning-whats-the-difference)
8+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Compare Two Branches and Get a List of Files
2+
3+
Comparing two branches (or even commits) might give your a lot of output, but you can tell Git to just give you a list of the files.
4+
5+
- `--name-only` gives your only filenames
6+
- `--name-status` gives you filenames and status
7+
8+
Compare current branch with master and get filenames and statuses:
9+
10+
```shell
11+
git diff --name-status master
12+
A git/compare_two_branches_and_get_a_list_of_files.md
13+
```
14+
15+
Or comparing current branch with master and get only filenames:
16+
17+
```shell
18+
git diff --name-only master
19+
git/compare_two_branches_and_get_a_list_of_files.md
20+
```
21+
22+
Compare two branches and get filenames and statuses:
23+
24+
```shell
25+
git diff --name-status master another_branch
26+
A go/use_mage_build_tool.md
27+
```
28+
29+
Compare two branches and get only filenames:
30+
31+
```shell
32+
╰─ git diff --name-only master another_branch
33+
go/use_mage_build_tool.md
34+
```
35+
36+
## Resources and References
37+
38+
- [StackOverflow: "How can I see the differences between two branches?"](https://stackoverflow.com/questions/9834689/how-can-i-see-the-differences-between-two-branches)
39+
- [StackOverflow: "Showing which files have changed between two revisions"](https://stackoverflow.com/questions/822811/showing-which-files-have-changed-between-two-revisions)

git/compare_two_branches_and_get_a_list_of_files.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Comparing two branches (or even commits) might give your a lot of output, but yo
55
- `--name-only` gives your only filenames
66
- `--name-status` gives you filenames and status
77

8-
Compare current branch with master and get filenames and statusses:
8+
Compare current branch with master and get filenames and statuses:
99

1010
```shell
1111
git diff --name-status master
@@ -19,7 +19,7 @@ git diff --name-only master
1919
git/compare_two_branches_and_get_a_list_of_files.md
2020
```
2121

22-
Compare two branches and get filenames and statusses:
22+
Compare two branches and get filenames and statuses:
2323

2424
```shell
2525
git diff --name-status master another_branch

go/use_mage_build_tool.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Use Mage Build Tool
22

3-
## Resources and References
3+
Mage is a Go build tool, an equivalent of Make for C.
4+
5+
TODO more to come
46

5-
- https://magefile.org/howitworks/
7+
## Resources and References
68

9+
- [magefile.org website](https://magefile.org/howitworks/)

httpie/use_httpie.md

+4
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,7 @@ Source used in example: http://jsonplaceholder.typicode.com/
4040
NB: Remember to quote URLs including `&` (ampersand) in the path.
4141

4242
You can with luck install `httpie` via [Homebrew](http://brew.sh/) on your Mac.
43+
44+
Additionally I can recommend a basic cheat sheet.
45+
46+
- [devhints.io: httpie cheat sheet](https://devhints.io/httpie)

php/comments.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Comments in PHP are different.
44

5-
PHP suports:
5+
PHP supports:
66

77
- `#`
88
- `//`

php/sprintf.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# sprintf
22

3-
Like many other languages PHP has a `sprintf`, the reason for this til was that rececently I came across two sections at about 18 lines of code, that could be written as single lines using `sprintf`.
3+
Like many other languages PHP has a `sprintf`, the reason for this til was that recently I came across two sections at about 18 lines of code, that could be written as single lines using `sprintf`.
44
So I dug into the PHP documentation to find out whether there was a reason not to.
55

66
## Zero-padding

ubuntu/missing_signed-by_in_the_sources.list.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Missing Signed-Bu in the sources.list(5)
22

3-
I came accross this error on a DigitalOcean droplet running Ubuntu the other day, when running:
3+
I came across this error on a DigitalOcean droplet running Ubuntu the other day, when running:
44

55
`sudo apt update`
66

0 commit comments

Comments
 (0)