Skip to content

Commit

Permalink
Merge pull request #11 from astroDimitrios/spolier_syntax_fix
Browse files Browse the repository at this point in the history
Fix spoiler syntax for FCM comparisons.
  • Loading branch information
astroDimitrios authored Oct 22, 2024
2 parents c6fb3a5 + 6029886 commit 9aab373
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 6 deletions.
6 changes: 4 additions & 2 deletions episodes/01-basics.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,15 @@ the same files concurrently.

::::::::::::::::::::::::::::::::::::::::: callout

## Moving to Git from FCM
## Migrating to Git from FCM

If you currently use [FCM](https://metomi.github.io/fcm/doc/user_guide/getting_started.html)
(a wrapper around Subversion, SVN) then look out for the following dropdowns.
They contain the FCM equivalent for git commands.

::: spoiler FCM Comparison
::: spoiler

### FCM Comparison

Running the `git ...` command is equivalent to:

Expand Down
4 changes: 3 additions & 1 deletion episodes/03-create.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@ No commits yet
nothing to commit (create/copy files and use "git add" to track)
```

::: spoiler FCM Comparison
::: spoiler

### FCM Comparison

`git status` is equivalent to:

Expand Down
8 changes: 6 additions & 2 deletions episodes/04-changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,9 @@ so that we can write a longer message.
changes made in the commit. Generally, the message should complete the sentence "If applied, this commit will" <commit message here>.
If you want to go into more detail, add a blank line between the summary line and your additional notes. Use this additional space to explain why you made changes and/or what their impact will be.

::: spoiler FCM Comparison
::: spoiler

### FCM Comparison

Running `git add` followed by `git commit` is equivalent to:

Expand Down Expand Up @@ -186,7 +188,9 @@ the commit's author,
when it was created,
and the log message Git was given when the commit was created.

::: spoiler FCM Comparison
::: spoiler

### FCM Comparison

`git log` is equivalent to:

Expand Down
4 changes: 3 additions & 1 deletion episodes/05-history.md
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,9 @@ By default,
it recovers the version of the file recorded in `HEAD`,
which is the last saved commit.

::: spoiler FCM Comparison
::: spoiler

### FCM Comparison

`git restore` is equivalent to:

Expand Down

0 comments on commit 9aab373

Please sign in to comment.