commit 8913f07123caafdcc12dbef368c7adb12b3e26d9
from: Stefan Sperling <stsp@stsp.name>
date: Wed Aug 14 10:47:14 2019 UTC

clarify bit about gerrit; typo fix

commit - 962b0cd93c96621175a3866d23b737026775969f
commit + 8913f07123caafdcc12dbef368c7adb12b3e26d9
blob - 990f8f5310d4cee49c2f4fd2cb976e744861895d
blob + 4efb77bc061668a16658e1d80561528763adb67a
--- notes-pull-push
+++ notes-pull-push
@@ -8,9 +8,9 @@ changes apply to the expected 'base blob' content (whi
 conflict-free file merge according to diff3), all added blobs get
 added where no blob exists yet, and only existing blobs get deleted.
 
-This part of gotd(8) would operate roughly like some sort of Gerrit
-server with merge strategy set to 'rebase-if-necessary', but without
-a code review UI and without Java.
+(As an analogy, this part of gotd(8) would operate roughly like some
+sort of Gerrit server with merge strategy set to 'rebase-if-necessary',
+but without a code review UI and without Java.)
 
 gotd(8) would also regulate read/write access to branches and perform
 various sanity checks on commits: require a log message, reject merge
@@ -59,7 +59,7 @@ got commit
    if success:
      temp commit becomes new head of local master
      optionally, user may run 'got pull' to rebase local version of master
-   else
+   else:
      require got pull
      try to commit again