commit a54b6686bf9e61e3c44c436393b1d17fa784b005 from: Stefan Sperling date: Fri Jun 28 10:19:08 2019 UTC suse shorter wording around object IDs in man pages commit - df0b3d8ac9d4da612a6c67d95dc66b75dd989ca3 commit + a54b6686bf9e61e3c44c436393b1d17fa784b005 blob - dfb9fe59e3b0e7c32ac71b60fb9b96a3d6b2bac3 blob + 46a99086d2e9aa39a2d214a39a1d256cb06f5921 --- got/got.1 +++ got/got.1 @@ -138,7 +138,7 @@ This option requires that all paths in the work tree a .It Fl c Ar commit Update the work tree to the specified .Ar commit . -The expected argument is a SHA1 hash which corresponds to a commit object. +The expected argument is a commit ID SHA1 hash. If this option is not specified, the most recent commit on the work tree's branch will be used. .El @@ -178,8 +178,7 @@ will be omitted. .It Fl c Ar commit Start traversing history at the specified .Ar commit . -The expected argument is the name of a branch or a SHA1 hash which corresponds -to a commit object. +The expected argument is the name of a branch or a commit ID SHA1 hash. If this option is not specified, default to the work tree's current branch if invoked in a work tree, or to the repository's HEAD reference. .It Fl C Ar number @@ -206,8 +205,7 @@ If a is specified, only show changes within this path. .Pp If two arguments are provided, treat each argument as a reference, -or a SHA1 hash, which corresponds to an object in the repository, -and display differences between these objects. +or an object ID SHA1 hash, and display differences between these objects. Both objects must be of the same type (blobs, trees, or commits). .Pp The options for @@ -235,8 +233,7 @@ are as follows: .It Fl c Ar commit Start traversing history at the specified .Ar commit . -The expected argument is the name of a branch or a SHA1 hash which corresponds -to a commit object. +The expected argument is the name of a branch or a commit ID SHA1 hash. .It Fl r Ar repository-path Use the repository at the specified path. If not specified, assume the repository is located at or above the current @@ -268,8 +265,7 @@ are as follows: .It Fl c Ar commit List files and directories as they appear in the specified .Ar commit . -The expected argument is the name of a branch or a SHA1 hash which corresponds -to a commit object. +The expected argument is the name of a branch or a commit ID SHA1 hash. .It Fl r Ar repository-path Use the repository at the specified path. If not specified, assume the repository is located at or above the current @@ -290,9 +286,8 @@ or update, the reference with the given .Ar name , and make it point at the given .Ar target . -The target may be a SHA1 hash which corresponds to an existing object ID -in the repository, or an existing reference which will be resolved to an -object ID. +The target may be an object ID SHA1 hash or an existing reference which +will be resolved to an object ID. .Pp The options for .Cm got ref @@ -419,8 +414,7 @@ into the work tree. The specified .Ar commit must be on a different branch than the work tree's base commit. -The expected argument is a reference or a SHA1 hash which corresponds to -a commit object. +The expected argument is a reference or a commit ID SHA1 hash. .Pp Show the status of each affected file, using the following status codes: .Bl -column YXZ description @@ -458,8 +452,7 @@ into the work tree. The specified .Ar commit must be on the same branch as the work tree's base commit. -The expected argument is a reference or a SHA1 hash which corresponds to -a commit object. +The expected argument is a reference or a commit ID SHA1 hash. .Pp Show the status of each affected file, using the following status codes: .Bl -column YXZ description blob - da9425a64c72070a47ca2ee6ababa9edf5f07295 blob + aae147e10a736201457765360242f34c13da438a --- tog/tog.1 +++ tog/tog.1 @@ -126,8 +126,7 @@ are as follows: .It Fl c Ar commit Start traversing history at the specified .Ar commit . -The expected argument is the name of a branch or a SHA1 hash which corresponds -to a commit object. +The expected argument is the name of a branch or a commit ID SHA1 hash. If this option is not specified, default to the work tree's current branch if invoked in a work tree, or to the repository's HEAD reference. .It Fl r Ar repository-path @@ -139,7 +138,7 @@ working directory. Display the differences between two objects in the repository. Each .Ar object -argument is a SHA1 hash which corresponds to the object. +argument is an object ID SHA1 hash. Both objects must be of the same type (blobs, trees, or commits). If the .Ar repository path @@ -214,8 +213,7 @@ are as follows: .It Fl c Ar commit Start traversing history at the specified .Ar commit . -The expected argument is the name of a branch or a SHA1 hash which corresponds -to a commit object. +The expected argument is the name of a branch or a commit ID SHA1 hash. .It Fl r Ar repository-path Use the repository at the specified path. If not specified, assume the repository is located at or above the current @@ -268,8 +266,7 @@ are as follows: .It Fl c Ar commit Start traversing history at the specified .Ar commit . -The expected argument is the name of a branch or a SHA1 hash which corresponds -to a commit object. +The expected argument is the name of a branch or a commit ID SHA1 hash. .El .El .Sh EXIT STATUS