commit - 8920fa0456335183a231225a79354b3fa592acb8
commit + bc3056e371270495a28abba4ecc49db3d40d6f56
blob - 4085020de060dcdd82f9ae36ea54ccc87f18f1e4
blob + 677dc0636905770f879f37341a86c7744276da35
--- got/git-repository.5
+++ got/git-repository.5
consequence of design choices made for the command-line interface of
.Xr git 1 .
The same characters are disallowed by Got for compatibility purposes.
-Got additionaly prevents users from creating reference names with
+Got additionally prevents users from creating reference names with
a leading - (dash) character, because this is rarely intended and
not considered useful.
blob - 73aea3cfea4330adf6c818c111123d56e65d918f
blob + 3caa70a3b90fb32af006222ca63d2b650bedb146
--- got/got.1
+++ got/got.1
.Pp
.Nm
provides global and command-specific options.
-Global options must preceed the command name, and are as follows:
+Global options must precede the command name, and are as follows:
.Bl -tag -width tenletters
.It Fl h
Display usage information and exit immediately.
cannot update paths with staged changes.
If changes have been staged with
.Cm got stage ,
-these changes must first be comitted with
+these changes must first be committed with
.Cm got commit
or unstaged with
.Cm got unstage .
Short alias for
.Cm remove .
.It Cm revert Oo Fl p Oc Oo Fl F Ar response-script Oc Oo Fl R Oc Ar path ...
-Revert any uncommited changes in files at the specified paths.
+Revert any uncommitted changes in files at the specified paths.
File contents will be overwritten with those contained in the
work tree's base commit.
There is no way to bring discarded changes back after
.Cm got diff ,
amended manually or with further
.Cm got cherrypick
-comands,
+commands,
committed with
.Cm got commit ,
or discarded again with
.Cm got diff ,
amended manually or with further
.Cm got backout
-comands,
+commands,
committed with
.Cm got commit ,
or discarded again with
The
.Ar branch
must share common ancestry with the work tree's current branch.
-Rebasing begins with the first descendent commit of the youngest
+Rebasing begins with the first descendant commit of the youngest
common ancestor commit shared by the specified
.Ar branch
and the work tree's current branch, and stops once the tip commit
.Cm got update .
If changes have been staged with
.Cm got stage ,
-these changes must first be comitted with
+these changes must first be committed with
.Cm got commit
or unstaged with
.Cm got unstage .
.Cm got update .
If changes have been staged with
.Cm got stage ,
-these changes must first be comitted with
+these changes must first be committed with
.Cm got commit
or unstaged with
.Cm got unstage .
.Sh AUTHORS
.An Stefan Sperling Aq Mt stsp@openbsd.org
.An Martin Pieuchot Aq Mt mpi@openbsd.org
-.An joshua stein Aq Mt jcs@openbsd.org
+.An Joshua Stein Aq Mt jcs@openbsd.org
.Sh CAVEATS
.Nm
is a work-in-progress and many commands remain to be implemented.
blob - a7499aede5fa0e897dac864134c6ed03bccfef71
blob + 46ebc3a92caf8f4523fa205630faacccc3fa263e
--- tog/tog.1
+++ tog/tog.1
.Xr re_format 7
.Sh AUTHORS
.An Stefan Sperling Aq Mt stsp@openbsd.org
-.An joshua stein Aq Mt jcs@openbsd.org
+.An Joshua Stein Aq Mt jcs@openbsd.org