Skip to content

Commit 3478cc9

Browse files
committed
DOC: Update website, add faq about git and git_enc
1 parent b9b1ee3 commit 3478cc9

File tree

1 file changed

+20
-1
lines changed

1 file changed

+20
-1
lines changed

README.full.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,27 @@ You can edit `$PLAIN_REPO/info/exclude`, which is **prepopulated with
283283
Additionally by inheritance, **myba
284284
[honors _.gitignore_ files](https://git-scm.com/docs/gitignore)**
285285
for any directories that contain them.
286-
You can tweak various other git settings (like config, filters, hooks)
286+
You can tweak various other git settings (like
287+
[config](https://git-scm.com/docs/git-config),
288+
[filters](https://git-scm.com/book/ms/v2/Customizing-Git-Git-Attributes#filters_a),
289+
[hooks](https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks))
287290
by modifying respective files in `$PLAIN_REPO` and (encrypted repo) `$PLAIN_REPO/_encrypted/.git`.
288291

292+
</div></div></details>
293+
<details markdown="1" property="mainEntity" typeof="Question">
294+
<summary property="name">Encryption failed. How do I investigate / recover?</summary>
295+
<div markdown="1" property="acceptedAnswer" typeof="Answer"><div markdown="1" property="text">
296+
297+
Myba constructs encrypted repo commits _after_ successful plain repo commits.
298+
299+
Use `myba git` and `myba git_enc` subcommands to discover what state you're in (e.g. `myba git status`).
300+
Then use something like `myba git reset HEAD^ ; myba git_enc reset HEAD` to reach an acceptable state.
301+
302+
**If it looks like a bug, please report it.**
303+
Otherwise git will let you know what the problem is.
304+
305+
Myba only **deletes redundant encrypted blobs after successfully pushing to _all_ configured remotes**,
306+
and **never deletes or overwrites existing files in work tree** unless forced!
307+
289308
</div></div></details>
290309
</div>

0 commit comments

Comments
 (0)