From 0e1601680b728bca10e380dfe9ce4f9a72d7a276 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Fri, 14 Apr 2017 22:05:47 -0700 Subject: [PATCH] doc: avoid colloquialism I witnessed an English-as-a-second-language speaker puzzle over the word "borked" in our documentation today. Reword to avoid colloquialisms. It's more precise and clear this way anyway. Also reformat `Optional:` to be consistent with how it appears elsewhere in the doc. --- COLLABORATOR_GUIDE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 4ce11257b707f2..df420c7297c52b 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -345,7 +345,7 @@ Additionally: ### Technical HOWTO -_Optional:_ ensure that you are not in a borked `am`/`rebase` state +Clear any `am`/`rebase` that may already be underway. ```text $ git am --abort