diff --git a/skills/merge-fix/SKILL.md b/skills/merge-fix/SKILL.md index 9b84317..c217f23 100644 --- a/skills/merge-fix/SKILL.md +++ b/skills/merge-fix/SKILL.md @@ -20,7 +20,7 @@ same tree may own. ## 2. Fetch everything -``` +```bash git fetch --all --prune --tags ``` @@ -37,7 +37,7 @@ one line so a wrong reading is visible before the search. Run all three; they find different things: -``` +```bash git log --all --oneline --regexp-ignore-case --grep='' git log --all --oneline -S'' git log --all --oneline -- '' diff --git a/skills/no-defaults/SKILL.md b/skills/no-defaults/SKILL.md index aa57df3..64e9d66 100644 --- a/skills/no-defaults/SKILL.md +++ b/skills/no-defaults/SKILL.md @@ -59,7 +59,7 @@ with `false`, `null`, or `""` is permitted, and with any other value is permitte only when justified in a comment. | Language | Never | Instead | -|---|---|---| +| --- | --- | --- | | Bash | `${VAR:-x}`, `${VAR:=x}`, `: "${VAR:=x}"` | `: "${VAR:?set VAR in }"` | | Python | `def f(a=1)`, `d.get(k, x)`, `getattr(o, n, x)`, `os.environ.get(k, x)`, `argparse(default=)` | required args, `d[k]`, `os.environ[k]`, `add_argument(required=True)` | | Jinja / Ansible | `\| default(x)`, `lookup('env', k) \| default('')` | `\| mandatory`, `assert` on the var |