commit 7f838b36bf8c0d39dd81201613e45646c1579ef0 from: Stefan Sperling date: Fri Feb 08 14:25:38 2019 UTC document status codes displayed by 'got update' commit - 6353ad76e488c8d0df631a779571fdeb41fc9c70 commit + 7f838b36bf8c0d39dd81201613e45646c1579ef0 blob - 9aadbc5d3225a201b9bf679c0a66cec01c80d0c6 blob + 914b39fda8d355979f18027abf6b0d7b7091aa65 --- got/got.1 +++ got/got.1 @@ -97,10 +97,21 @@ will be checked out. .It Cm update [ Fl c Ar commit ] [ work-tree-path ] Update an existing work tree to another commit on the current branch. By default, the latest commit on the current branch is assumed. +Show the status of each affected file, using the following status codes: +.Bl -column YXZ description +.It U Ta file was updated and contained no local changes +.It G Ta file was updated and local changes were merged cleanly +.It C Ta file was updated and conflicts occurred during merge +.It D Ta file was deleted +.It A Ta new file was added +.It ~ Ta versioned file is obstructed by a non-regular file +.El +.Pp If the .Ar work tree path is omitted, use the current working directory. .Pp +.Pp The options for .Cm got update are as follows: