cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-05 23:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

docs: use styled admonition blocks for warnings

Browse Source 
This is consistent with the rest of the docs.
This commit is contained in:
Vincent Ging Ho Yim 2024-07-20 01:36:14 +10:00
parent e091172b63
commit 539cd75f90
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/config.md
View File

@ -910,9 +910,10 @@ obtained as follows:
options](https://gist.github.com/ilyagr/1b40f6061d8ad320cee4c12843df1a23) but, options](https://gist.github.com/ilyagr/1b40f6061d8ad320cee4c12843df1a23) but,
as of this writing, this is by far the easiest. as of this writing, this is by far the easiest.
*Warning:* Do *not* use the Homebrew `meld` package. !!! warning
It does not work on ARM Macs and may have problems on recent versions of Mac
OS. 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 `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). and `meld-3` for a [three-pane view](#experimental-3-pane-diff-editing).

7
docs/github.md
View File

@ -126,9 +126,10 @@ $ jj git push
Notably, the above workflow creates a new commit for you. The same can be Notably, the above workflow creates a new commit for you. The same can be
achieved without creating a new commit. achieved without creating a new commit.
> **Warning** !!! warning
> We strongly suggest to `jj new` after the example below, as all further edits
> still get amended to the previous commit. We strongly suggest to `jj new` after the example below, as all further edits
still get amended to the previous commit.
```shell ```shell
$ # Create a new commit on top of the `your-feature` bookmark from above. $ # Create a new commit on top of the `your-feature` bookmark from above.