commit - 0ae61b79f6344b7913b8daf346b41b4e3fe8211a
commit + e38d4cdede4142c7bae75cc884f5ce57dad297af
blob - be17028e28d2038b9f511fc7562d1249103a1f69
blob + 9687534b4b92ebee09a868f8da1b349394ad1c09
--- got/git-repository.5
+++ got/git-repository.5
@@ -107,7 +107,7 @@ A reference associates a name with an object ID.
 A prominent use of references is providing names to branches in the
 repository by pointing at commit objects which represent the current
 tip commit of a branch.
-Because references may point to arbitrary object IDs their use
+Because references may point to arbitrary object IDs, their use
 is not limited to branches.
 .Pp
 The name is a UTF-8 string with the following disallowed characters:
blob - 9c86194132d8a56b151a824def4930b81db91e83
blob + 8c026ec1c7d6331ed8a853ed0ccd2b3cf5808e75
--- got/got-worktree.5
+++ got/got-worktree.5
@@ -149,7 +149,7 @@ create a reference to the current base commit in the G
 The presence of this reference prevents the Git garbage collector and
 .Cm gotadmin cleanup
 from discarding the base commit and any objects it refers to.
-When a work tree is no longer needed its reference can be deleted from
+When a work tree is no longer needed, its reference can be deleted from
 the Git repository with
 .Cm got ref -d .
 .Sh FILES
blob - e45d19779f8e92372a5e4aa275cfc6837fc9b8e0
blob + dc1e00a11a6ba70a28e0c03648028507765aff97
--- got/got.1
+++ got/got.1
@@ -143,7 +143,7 @@ into the specified
 .Ar directory .
 If no
 .Ar directory
-is specified the directory name will be derived from the name of the
+is specified, the directory name will be derived from the name of the
 cloned repository.
 .Cm got clone
 will refuse to run if the
@@ -348,7 +348,7 @@ namespace, merging incoming changes with the changes o
 as necessary.
 .Pp
 If the repository was created as a mirror with
-.Cm got clone -m
+.Cm got clone -m ,
 then all branches in the
 .Dq refs/heads/
 namespace will be updated directly to match the corresponding branches in
@@ -540,7 +540,7 @@ is not contained in the selected branch, a different b
 this commit must be specified with the
 .Fl b
 option.
-If no such branch is known a new branch must be created for this
+If no such branch is known, a new branch must be created for this
 commit with
 .Cm got branch
 before
@@ -570,7 +570,7 @@ further complications.
 Such files will be updated when
 .Cm got update
 is run again after merge conflicts have been resolved.
-If the conflicting changes are no longer needed affected files can be
+If the conflicting changes are no longer needed, affected files can be
 reverted with
 .Cm got revert
 before running
@@ -816,7 +816,7 @@ If specified, show only commits with a log message mat
 regular expression
 .Ar search-pattern .
 When used together with
-.Fl P
+.Fl P ,
 then the file paths changed by a commit can be matched as well.
 Regular expression syntax is documented in
 .Xr re_format 7 .
@@ -1071,12 +1071,12 @@ The
 .Cm got branch
 command creates references in this namespace only.
 .Pp
-When deleting branches the specified
+When deleting branches, the specified
 .Ar name
 is searched in the
 .Dq refs/heads
 reference namespace first.
-If no corresponding branch is found the
+If no corresponding branch is found, the
 .Dq refs/remotes
 namespace will be searched next.
 .Pp
@@ -1306,7 +1306,7 @@ argument is provided, read unified diff data from stan
 .Pp
 If the
 .Ar patchfile
-contains multiple patches then attempt to apply each of them in sequence.
+contains multiple patches, then attempt to apply each of them in sequence.
 .Pp
 Show the status of each affected file, using the following status codes:
 .Bl -column XYZ description
@@ -1349,7 +1349,7 @@ Do not make any modifications to the work tree.
 This can be used to check whether a patch would apply without issues.
 If the
 .Ar patchfile
-contains diffs that affect the same file multiple times the results
+contains diffs that affect the same file multiple times, the results
 displayed may be incorrect.
 .El
 .Tg rv
@@ -1362,10 +1362,10 @@ There is no way to bring discarded changes back after
 .Cm got revert !
 .Pp
 If a file was added with
-.Cm got add
+.Cm got add ,
 it will become an unversioned file again.
 If a file was deleted with
-.Cm got remove
+.Cm got remove ,
 it will be restored.
 .Pp
 The options for
@@ -1744,7 +1744,7 @@ or discarded again with
 .Pp
 .Cm got cherrypick
 will refuse to run if certain preconditions are not met.
-If the work tree contains multiple base commits it must first be updated
+If the work tree contains multiple base commits, it must first be updated
 to a single base commit with
 .Cm got update .
 If any relevant files already contain merge conflicts, these
@@ -1787,7 +1787,7 @@ or discarded again with
 .Pp
 .Cm got backout
 will refuse to run if certain preconditions are not met.
-If the work tree contains multiple base commits it must first be updated
+If the work tree contains multiple base commits, it must first be updated
 to a single base commit with
 .Cm got update .
 If any relevant files already contain merge conflicts, these
@@ -1860,7 +1860,7 @@ using the following status codes:
 .It ? Ta changes destined for an unversioned file were not merged
 .El
 .Pp
-If merge conflicts occur the rebase operation is interrupted and may
+If merge conflicts occur, the rebase operation is interrupted and may
 be continued once conflicts have been resolved.
 If any files with destined changes are found to be missing or unversioned,
 or if files could not be deleted due to differences in deleted content,
@@ -1879,7 +1879,7 @@ when the rebase operation continues.
 .Cm got rebase
 will refuse to run if certain preconditions are not met.
 If the work tree is not yet fully updated to the tip commit of its
-branch then the work tree must first be updated with
+branch, then the work tree must first be updated with
 .Cm got update .
 If changes have been staged with
 .Cm got stage ,
@@ -1907,7 +1907,7 @@ conflict resolution purposes.
 .Pp
 If the specified
 .Ar branch
-is already based on the work tree's current branch then no commits
+is already based on the work tree's current branch, then no commits
 need to be rebased and
 .Cm got rebase
 will simply switch the work tree to the specified
@@ -1989,7 +1989,7 @@ the tip commit of the work tree's current branch.
 .Pp
 Before starting a
 .Cm histedit
-operation the work tree's current branch must be set with
+operation, the work tree's current branch must be set with
 .Cm got update -b
 to the branch which should be edited, unless this branch is already the
 current branch of the work tree.
@@ -2073,7 +2073,7 @@ using the following status codes:
 .It ? Ta changes destined for an unversioned file were not merged
 .El
 .Pp
-If merge conflicts occur the histedit operation is interrupted and may
+If merge conflicts occur, the histedit operation is interrupted and may
 be continued once conflicts have been resolved.
 If any files with destined changes are found to be missing or unversioned,
 or if files could not be deleted due to differences in deleted content,
@@ -2093,7 +2093,7 @@ will refuse to run if certain preconditions are not me
 If the work tree's current branch is not in the
 .Dq refs/heads/
 reference namespace, the history of the branch may not be edited.
-If the work tree contains multiple base commits it must first be updated
+If the work tree contains multiple base commits, it must first be updated
 to a single base commit with
 .Cm got update .
 If changes have been staged with
@@ -2255,7 +2255,7 @@ must have been rebased onto the work tree's current br
 .Cm got rebase
 before it can be integrated, in order to linearize commit history and
 resolve merge conflicts.
-If the work tree contains multiple base commits it must first be updated
+If the work tree contains multiple base commits, it must first be updated
 to a single base commit with
 .Cm got update .
 If changes have been staged with
@@ -2345,7 +2345,7 @@ instead.
 If the work tree is not yet fully updated to the tip commit of its
 branch, then the work tree must first be updated with
 .Cm got update .
-If the work tree contains multiple base commits it must first be updated
+If the work tree contains multiple base commits, it must first be updated
 to a single base commit with
 .Cm got update .
 If changes have been staged with
@@ -2446,7 +2446,7 @@ are as follows:
 .It Fl l
 Instead of staging new changes, list paths which are already staged,
 along with the IDs of staged blob objects and stage status codes.
-If paths were provided in the command line show the staged paths
+If paths were provided on the command line, show the staged paths
 among the specified paths.
 Otherwise, show all staged paths.
 .It Fl p
@@ -2988,7 +2988,7 @@ branch with
 .Cm got integrate .
 Because the rebase operation switched the work tree to the
 .Dq unified-buffer-cache
-branch the work tree must be switched back to the
+branch, the work tree must be switched back to the
 .Dq master
 branch first:
 .Pp
@@ -3004,7 +3004,7 @@ by other developers and any other important new inform
 .Dl $ got update -c origin/master
 .Dl $ got histedit -m
 .Pp
-If the remote repository offers write access local changes on the
+If the remote repository offers write access, local changes on the
 .Dq master
 branch can be sent to the remote repository with
 .Cm got send .
@@ -3018,7 +3018,7 @@ branch:
 .Pp
 .Dl $ got send -b master origin
 .Pp
-If the remote repository requires the HTTPS protocol the
+If the remote repository requires the HTTPS protocol, the
 .Xr git-push 1
 command must be used instead:
 .Pp
blob - 2d141d7969e05f91ddc4a197ee4ab5ff59674b47
blob + 997a10f0a2c6d6c9750ef3660207ac358a4d56ea
--- gotadmin/gotadmin.1
+++ gotadmin/gotadmin.1
@@ -160,7 +160,7 @@ Each object contained in the pack file will be display
 The information shown includes the object ID, object type, object offset,
 and object size.
 .Pp
-If a packed object is deltified against another object the delta base
+If a packed object is deltified against another object, the delta base
 will be shown as well.
 For offset deltas, the delta base is identified via an offset into the
 pack file.
@@ -251,8 +251,8 @@ pack file, which is an inconsistent repository state.
 In such cases,
 .Cm gotadmin cleanup -p -n
 will display a list of affected pack index files.
-Whenever possible the missing pack files should be restored.
-If restoring missing pack files is not possible then affected pack index
+Whenever possible, the missing pack files should be restored.
+If restoring missing pack files is not possible, then affected pack index
 files can be removed with
 .Cm gotadmin cleanup -p .
 .Pp
blob - 7891dc0361f6c50d00493676ef0e020ff215b8b2
blob + 9ffaae36730332eea4010cd1a92aca8e2ad8117a
--- tog/tog.1
+++ tog/tog.1
@@ -114,7 +114,7 @@ Move the cursor to the newest commit.
 Move the cursor to the oldest commit.
 This will traverse all commits on the current branch which may take
 a long time depending on the number of commits in branch history.
-If needed this operation can be cancelled with
+If needed, this operation can be cancelled with
 .Cm Backspace .
 .It Cm Enter, Space
 Open a