Skip to content

Commit

Permalink
docs: use styled admonition blocks for warnings
Browse files Browse the repository at this point in the history
This is consistent with the rest of the docs.
  • Loading branch information
cenviity committed Feb 5, 2025
1 parent e091172 commit 539cd75
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
7 changes: 4 additions & 3 deletions docs/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -910,9 +910,10 @@ obtained as follows:
options](https://gist.github.com/ilyagr/1b40f6061d8ad320cee4c12843df1a23) but,
as of this writing, this is by far the easiest.

*Warning:* Do *not* use the Homebrew `meld` package.
It does not work on ARM Macs and may have problems on recent versions of Mac
OS.
!!! warning

Do *not* use the Homebrew `meld` package.
It does not work on ARM Macs and may have problems on recent versions of macOS.

`jj` has two diff editing configurations that use Meld: `meld` for a 2-pane view
and `meld-3` for a [three-pane view](#experimental-3-pane-diff-editing).
Expand Down
7 changes: 4 additions & 3 deletions docs/github.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,10 @@ $ jj git push
Notably, the above workflow creates a new commit for you. The same can be
achieved without creating a new commit.

> **Warning**
> We strongly suggest to `jj new` after the example below, as all further edits
> still get amended to the previous commit.
!!! warning

We strongly suggest to `jj new` after the example below, as all further edits
still get amended to the previous commit.

```shell
$ # Create a new commit on top of the `your-feature` bookmark from above.
Expand Down

0 comments on commit 539cd75

Please sign in to comment.