diff options
| author | Jacob Moody <moody@posixcafe.org> | 2023-03-13 21:40:44 +0000 |
|---|---|---|
| committer | Jacob Moody <moody@posixcafe.org> | 2023-03-13 21:40:44 +0000 |
| commit | 2d976ec561716a5ae1ac0739b32b30bc80fd21e9 (patch) | |
| tree | 9499fd339c8fdd366db1febb949d350dafd30974 /sys/man/1/git | |
| parent | f5b78f452e48323484e6363d46a2aa631a956349 (diff) | |
man1: various spelling fixes
Diffstat (limited to 'sys/man/1/git')
| -rw-r--r-- | sys/man/1/git | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/man/1/git b/sys/man/1/git index db695ed9f..4ccbf8c72 100644 --- a/sys/man/1/git +++ b/sys/man/1/git @@ -342,7 +342,7 @@ flag opens an editor to finalize the commit message, regardless of whether or not it was specified explicitly or reused. To amend a commit message, .B -r -can be used in conjuction with +can be used in conjunction with .B -m or .BR -e . @@ -373,7 +373,7 @@ When passed the option, the branch is deleted. .PP When switching branches, git/branch will refuse to clobber -modificiations. +modifications. Passing the .B -m option will cause git9 to attempt to merge the changes between @@ -438,7 +438,7 @@ date information. .B Git/merge takes two branches and merges them filewise using .IR ape/diff3 . -The next commit made will be a merge commmit. +The next commit made will be a merge commit. .PP .B Git/rebase @@ -599,7 +599,7 @@ and .IR hjgit:// . Both are the .I git:// -protocol, tunnelled over tls. +protocol, tunneled over tls. .I Hjgit:// authenticates with the server using Plan 9 authentication, using |