From: Klemens Nanni Subject: Re: Always list aliases before full command To: gameoftrees@openbsd.org Date: Mon, 4 Oct 2021 12:27:15 +0000 diff ba4404b589c2e83e7ab1979087e3767fb1f574a9 aade88ecb31baed38ce57d0c227dfed43531004b blob - 450e4baab5541257e9c371762a5fe893fa1c19bb blob + 9a993ce8355818cf2f60d8fcab340ca10a937a74 --- got/got.1 +++ got/got.1 @@ -73,6 +73,9 @@ the command must be used to populate the empty repository before .Cm got checkout can be used. +.It Cm im +Short alias for +.Cm import . .It Cm import Oo Fl b Ar branch Oc Oo Fl m Ar message Oc Oo Fl r Ar repository-path Oc Oo Fl I Ar pattern Oc Ar directory Create an initial commit in a repository from the file hierarchy within the specified @@ -132,9 +135,9 @@ The follows the globbing rules documented in .Xr glob 7 . .El -.It Cm im +.It Cm cl Short alias for -.Cm import . +.Cm clone . .It Cm clone Oo Fl a Oc Oo Fl b Ar branch Oc Oo Fl l Oc Oo Fl m Oc Oo Fl q Oc Oo Fl v Oc Oo Fl R Ar reference Oc Ar repository-URL Op Ar directory Clone a Git repository at the specified .Ar repository-URL @@ -164,6 +167,8 @@ The Git protocol as implemented by the server. Use of this protocol is discouraged since it supports neither authentication nor encryption. +.It ssh +Short alias for git+ssh. .It git+ssh The Git protocol wrapped in an authenticated and encrypted .Xr ssh 1 @@ -172,8 +177,6 @@ With this protocol the hostname may contain an embedde .Xr ssh 1 to use: .Mt user@hostname -.It ssh -Short alias for git+ssh. .El .Pp Objects in the cloned repository are stored in a pack file which is downloaded @@ -316,9 +319,9 @@ or .Dq refs/got/ namespace. .El -.It Cm cl +.It Cm fe Short alias for -.Cm clone . +.Cm fetch . .It Cm fetch Oo Fl a Oc Oo Fl b Ar branch Oc Oo Fl d Oc Oo Fl l Oc Oo Fl r Ar repository-path Oc Oo Fl t Oc Oo Fl q Oc Oo Fl v Oc Oo Fl R Ar reference Oc Oo Fl X Oc Op Ar remote-repository Fetch new changes from a remote repository. If no @@ -490,9 +493,9 @@ will generally be stored in pack files and may be remo .Xr git-repack 1 and Git's garbage collector. .El -.It Cm fe +.It Cm co Short alias for -.Cm fetch . +.Cm checkout . .It Cm checkout Oo Fl E Oc Oo Fl b Ar branch Oc Oo Fl c Ar commit Oc Oo Fl p Ar path-prefix Oc Oo Fl q Oc Ar repository-path Op Ar work-tree-path Copy files from a repository into a new work tree. Show the status of each affected file, using the following status codes: @@ -556,9 +559,9 @@ will be checked out. .It Fl q Silence progress output. .El -.It Cm co +.It Cm up Short alias for -.Cm checkout . +.Cm update . .It Cm update Oo Fl b Ar branch Oc Oo Fl c Ar commit Oc Oo Fl q Oc Op Ar path ... Update an existing work tree to a different .Ar commit . @@ -655,9 +658,9 @@ branch will be used. .It Fl q Silence progress output. .El -.It Cm up +.It Cm st Short alias for -.Cm update . +.Cm status . .It Cm status Oo Fl I Oc Oo Fl s Ar status-codes Oc Oo Fl S Ar status-codes Oc Op Ar path ... Show the current modification status of files in a work tree, using the following status codes: @@ -759,9 +762,6 @@ does not support negated ignore patterns prefixed with and gives no special significance to the location of path component separators, .Dq / , in a pattern. -.It Cm st -Short alias for -.Cm status . .It Cm log Oo Fl b Oc Oo Fl c Ar commit Oc Oo Fl C Ar number Oc Oo Fl l Ar N Oc Oo Fl p Oc Oo Fl P Oc Oo Fl s Ar search-pattern Oc Oo Fl r Ar repository-path Oc Oo Fl R Oc Oo Fl x Ar commit Oc Op Ar path Display history of a repository. If a @@ -844,6 +844,9 @@ This option has no effect if the specified .Ar commit is never traversed. .El +.It Cm di +Short alias for +.Cm diff . .It Cm diff Oo Fl a Oc Oo Fl C Ar number Oc Oo Fl r Ar repository-path Oc Oo Fl s Oc Oo Fl w Oc Op Ar object1 Ar object2 | Ar path When invoked within a work tree with less than two arguments, display local changes in the work tree. @@ -884,9 +887,9 @@ is invoked in a work tree. .It Fl w Ignore whitespace-only changes. .El -.It Cm di +.It Cm bl Short alias for -.Cm diff . +.Cm blame . .It Cm blame Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Ar path Display line-by-line history of a file at the specified path. .Pp @@ -909,9 +912,9 @@ If this directory is a .Nm work tree, use the repository path associated with this work tree. .El -.It Cm bl +.It Cm tr Short alias for -.Cm blame . +.Cm tree . .It Cm tree Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Oo Fl i Oc Oo Fl R Oc Op Ar path Display a listing of files and directories at the specified directory path in the repository. @@ -955,9 +958,6 @@ Show object IDs of files (blob objects) and directorie .It Fl R Recurse into sub-directories in the repository. .El -.It Cm tr -Short alias for -.Cm tree . .It Cm ref Oo Fl r Ar repository-path Oc Oo Fl l Oc Oo Fl c Ar object Oc Oo Fl s Ar reference Oc Oo Fl d Oc Op Ar name Manage references in a repository. .Pp @@ -1024,6 +1024,9 @@ Git's garbage collector or Cannot be used together with any other options except .Fl r . .El +.It Cm br +Short alias for +.Cm branch . .It Cm branch Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Oo Fl l Oc Oo Fl d Ar name Oc Oo Fl n Oc Op Ar name Create, list, or delete branches. .Pp @@ -1116,9 +1119,6 @@ Git's garbage collector or .It Fl n Do not switch and update the work tree after creating a new branch. .El -.It Cm br -Short alias for -.Cm branch . .It Cm tag Oo Fl c Ar commit Oc Oo Fl m Ar message Oc Oo Fl r Ar repository-path Oc Oo Fl l Oc Ar name Manage tags in a repository. .Pp @@ -1202,6 +1202,9 @@ Add files even if they match a .Cm got status ignore pattern. .El +.It Cm rm +Short alias for +.Cm remove . .It Cm remove Oo Fl f Oc Oo Fl k Oc Oo Fl R Oc Oo Fl s Ar status-codes Oc Ar path ... Remove versioned files from a work tree and schedule them for deletion from the repository in the next commit. @@ -1234,9 +1237,9 @@ option) .It ! Ta versioned file expected on disk but missing .El .El -.It Cm rm +.It Cm rv Short alias for -.Cm remove . +.Cm revert . .It Cm revert Oo Fl p Oc Oo Fl F Ar response-script Oc Oo Fl R Oc Ar path ... Revert any local changes in files at the specified paths in a work tree. File contents will be overwritten with those contained in the @@ -1286,9 +1289,9 @@ will refuse to run if a specified .Ar path is a directory. .El -.It Cm rv +.It Cm ci Short alias for -.Cm revert . +.Cm commit . .It Cm commit Oo Fl F Ar path Oc Oo Fl m Ar message Oc Oo Fl N Oc Oo Fl S Oc Op Ar path ... Create a new commit in the repository from changes in a work tree and use this commit as the new base commit for the work tree. @@ -1403,9 +1406,9 @@ If a path is found to be out of date, .Cm got update must be used first in order to merge local changes with changes made in the repository. -.It Cm ci +.It Cm se Short alias for -.Cm commit . +.Cm send . .It Cm send Oo Fl a Oc Oo Fl b Ar branch Oc Oo Fl d Ar branch Oc Oo Fl f Oc Oo Fl r Ar repository-path Oc Oo Fl t Ar tag Oc Oo Fl T Oc Oo Fl q Oc Oo Fl v Oc Op Ar remote-repository Send new changes to a remote repository. If no @@ -1591,9 +1594,9 @@ if applicable. Multiple -v options increase the verbosity. The maximum is 3. .El -.It Cm se +.It Cm cy Short alias for -.Cm send . +.Cm cherrypick . .It Cm cherrypick Ar commit Merge changes from a single .Ar commit @@ -1635,9 +1638,9 @@ to a single base commit with .Cm got update . If any relevant files already contain merge conflicts, these conflicts must be resolved first. -.It Cm cy +.It Cm bo Short alias for -.Cm cherrypick . +.Cm backout . .It Cm backout Ar commit Reverse-merge changes from a single .Ar commit @@ -1679,9 +1682,9 @@ to a single base commit with .Cm got update . If any relevant files already contain merge conflicts, these conflicts must be resolved first. -.It Cm bo +.It Cm rb Short alias for -.Cm backout . +.Cm rebase . .It Cm rebase Oo Fl a Oc Oo Fl c Oc Oo Fl l Oc Oo Fl X Oc Op Ar branch Rebase commits on the specified .Ar branch @@ -1860,9 +1863,9 @@ does not require a work tree. None of the other options can be used together with .Fl X . .El -.It Cm rb +.It Cm he Short alias for -.Cm rebase . +.Cm histedit . .It Cm histedit Oo Fl a Oc Oo Fl c Oc Oo Fl e Oc Oo Fl f Oc Oo Fl F Ar histedit-script Oc Oo Fl m Oc Oo Fl l Oc Oo Fl X Oc Op Ar branch Edit commit history between the work tree's current base commit and the tip commit of the work tree's current branch. @@ -2098,9 +2101,9 @@ does not require a work tree. None of the other options can be used together with .Fl X . .El -.It Cm he +.It Cm ig Short alias for -.Cm histedit . +.Cm integrate . .It Cm integrate Ar branch Integrate the specified .Ar branch @@ -2150,9 +2153,9 @@ committed with .Cm got commit or reverted with .Cm got revert . -.It Cm ig +.It Cm mg Short alias for -.Cm integrate . +.Cm merge . .It Cm merge Oo Fl a Oc Oo Fl c Oc Oo Fl n Oc Op Ar branch Create a merge commit based on the current branch of the work tree and the specified @@ -2277,9 +2280,9 @@ created with Alternatively, the merge may be aborted with .Cm got merge -a . .El -.It Cm mg +.It Cm sg Short alias for -.Cm merge . +.Cm stage . .It Cm stage Oo Fl l Oc Oo Fl p Oc Oo Fl F Ar response-script Oc Oo Fl S Oc Op Ar path ... Stage local changes for inclusion in the next commit. If no @@ -2394,9 +2397,9 @@ is out of date, the path must be unstaged with before it can be updated with .Cm got update , and may then be staged again if necessary. -.It Cm sg +.It Cm ug Short alias for -.Cm stage . +.Cm unstage . .It Cm unstage Oo Fl p Oc Oo Fl F Ar response-script Oc Op Ar path ... Merge staged changes back into the work tree and put affected paths back into non-staged status. @@ -2443,9 +2446,6 @@ responses line-by-line from the specified .Ar response-script file instead of prompting interactively. .El -.It Cm ug -Short alias for -.Cm unstage . .It Cm cat Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Oo Fl P Oc Ar arg ... Parse and print contents of objects to standard output in a line-based text format.