Skip to content

Commit

Permalink
Merge pull request #268 from coderefinery/rkdarst/metavars
Browse files Browse the repository at this point in the history
Change from <name> to NAME metavariables
  • Loading branch information
bast authored Sep 15, 2023
2 parents 51ca41d + c0c1a3a commit 4ca52e3
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions content/centralized.md
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,10 @@ steps from other learners and helpers!
### Step A. Clone your maintainer's group repository

```console
$ git clone <repository-url> centralized-workflow-exercise
$ git clone REPOSITORY-URL centralized-workflow-exercise
```

Where `<repository-url>` is the repository created by the exercise
Where `REPOSITORY-URL` is the repository created by the exercise
maintainer.

**Clone using the SSH path** you get from the webpage (the one that starts with
Expand Down Expand Up @@ -262,7 +262,7 @@ clicking "Code", copying the SSH URL (starts with `[email protected]:`),
and then updating the URL with:
```console
$ git remote set-url origin <ssh-repository-url>
$ git remote set-url origin SSH-REPOSITORY-URL
```
````

Expand Down
8 changes: 4 additions & 4 deletions content/distributed.md
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ clicking "Code", copying the SSH URL (starts with `[email protected]:`),
and then updating the URL with:
```console
$ git remote set-url origin <repository-url>
$ git remote set-url origin REPOSITORY-URL
```
````

Expand Down Expand Up @@ -422,8 +422,8 @@ instead of aliases like `origin` or `upstream`.
Here we pull from the central repo and push to our fork:
```console
$ git switch main
$ git pull <central-repository-url> main
$ git push <fork-url> main
$ git pull CENTRAL-REPOSITORY-URL main
$ git push FORK-URL main
```
Here is a pictorial representation of this part:
Expand All @@ -441,7 +441,7 @@ Below is a step by step recipe with pictorial representations which hopefully
makes clear what happens in each step.
```console
$ git remote add central <central-repository-url>
$ git remote add central CENTRAL-REPOSITORY-URL
$ git fetch central
```
Expand Down
14 changes: 7 additions & 7 deletions content/reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ cheatsheet](https://coderefinery.github.io/git-intro/reference/).

Setup:

* `git clone <url> [<target-directory>]`: Make a copy of existing
* `git clone URL [TARGET-DIRECTORY]`: Make a copy of existing
repository at &lt;url&gt;, containing all history.

Status:
Expand All @@ -55,17 +55,17 @@ Status:

General work:

* `git switch <branch-name>`: Make a branch active.
* `git push [<remote-name>] [<branch>:<branch>]`: Send commits and
* `git switch BRANCH-NAME`: Make a branch active.
* `git push [REMOTE-NAME] [BRANCH:BRANCH]`: Send commits and
update the branch on the remote.
* `git pull [<remote-name>] [<branch-name>]`: Fetch and then merge
* `git pull [REMOTE-NAME] [BRANCH-NAME]`: Fetch and then merge
automatically. Can be convenient, but to be careful you can fetch
and merge separately.
* `git fetch [<remote-name>]`: Get commits from the remote. Doesn't
* `git fetch [REMOTE-NAME]`: Get commits from the remote. Doesn't
update local branches, but updates the remote tracking branches
(like origin/NAME).
* `git merge [<branch-name>]`: Updates your current branch with
* `git merge [BRANCH-NAME]`: Updates your current branch with
changes from another branch. By default, merges to the branch is is
tracking by default.
* `git remote add <remote-name> <url>`: Adds a new remote with a
* `git remote add REMOTE-NAME URL`: Adds a new remote with a
certain name.

0 comments on commit 4ca52e3

Please sign in to comment.