commit 7c3b4ab81d876a0e07ae5b2c6c593a7b25458ba6 from: Stefan Sperling date: Tue Feb 25 13:02:16 2020 UTC sync man pages commit - 5c074389f63c119210704d88bfdf6c73c41628f8 commit + 7c3b4ab81d876a0e07ae5b2c6c593a7b25458ba6 blob - ec9606b4475cf810e09b0e9111713756cef444a7 blob + e6e2fa5599ccc7c365827f8f1cc11196218b30d0 --- git-repository.5.html +++ git-repository.5.html @@ -208,7 +208,7 @@ - +

February 18, 2020

February 25, 2020

OpenBSD 6.6

blob - 5f8314ad2defb4b2fea3e186d3a3ecd08c1389c0 blob + 815d8191d231537981dceadf631c6f1d69b89923 --- got-worktree.5.html +++ got-worktree.5.html @@ -174,7 +174,7 @@ - +

February 18, 2020

February 25, 2020

OpenBSD 6.6

blob - 999728f012721a0813a2c1d886f685751bd37fd7 blob + 1abcaf63a60ce2685427d34f5ab4ceba5503b9f8 --- got.1.html +++ got.1.html @@ -367,7 +367,11 @@ [-r repository-path] [path]

Display history of a repository. If a path is - specified, show only commits which modified this path. + specified, show only commits which modified this path. If invoked in a + work tree, the path is interpreted relative to the + current working directory, and the work tree's path prefix is implicitly + prepended. Otherwise, the path is interpreted relative to the repository + root.

The options for got log are as follows:

-ccommit-rrepository-path-l-dnamenameManage branches in a repository. + name] [-n] + [name] +

Create, list, or delete branches.

Branches are managed via references which live in the “refs/heads/” reference namespace. The got branch command operates on references in this namespace only.

If invoked in a work tree without any arguments, print the - name of the work tree's current branch. If a name - argument is passed, attempt to create a branch reference with the given - name. By default the new branch reference will point at the latest - commit on the work tree's current branch if invoked in a work tree, and - otherwise to a commit resolved via the repository's HEAD reference.

+ name of the work tree's current branch.

If a name argument is passed, attempt to + create a branch reference with the given name. By default the new branch + reference will point at the latest commit on the work tree's current + branch if invoked in a work tree, and otherwise to a commit resolved via + the repository's HEAD reference.

If invoked in a work tree, once the branch was created + successfully switch the work tree's head reference to the newly created + branch and update files across the entire work tree, just like + got update -b name would + do. Show the status of each affected file, using the following status + codes:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

U	file was updated and contained no local changes
G	file was updated and local changes were merged cleanly
C	file was updated and conflicts occurred during merge
D	file was deleted
A	new file was added
~	versioned file is obstructed by a non-regular file
!	a missing versioned file was restored

The options for got branch are as follows:

@@ -622,15 +664,18 @@ the branch reference is deleted. Any commit, tree, and blob objects belonging to the branch remain in the repository and may be removed separately with Git's garbage collector.

-n

Do not switch and update the work tree after creating a new + branch.

br

Short alias for branch.

tag + [-c commit] [-m message] [-r repository-path] - [-l] name - [commit]

+ [-l] name

Manage tags in a repository.

Tags are managed via references which live in the “refs/tags/” reference namespace. The got @@ -638,21 +683,26 @@ References in this namespace point at tag objects which contain a pointer to another object, a tag message, as well as author and timestamp information.


-    Expect one or two arguments and attempt to create a tag with
-        the given name, and make this tag point at the
-        given commit. If no commit is specified, default
-        to the latest commit on the work tree's current branch if invoked in a
-        work tree, and to a commit resolved via the repository's HEAD reference
-        otherwise. Otherwise, the expected argument is a commit ID SHA1 hash or
-        an existing reference or tag name which will be resolved to a commit ID.
-        An abbreviated hash argument will be expanded to a full SHA1 hash
-        automatically, provided the abbreviation is unique.
+    Attempt to create a tag with the given
+        name, and make this tag point at the given
+        commit. If no commit is specified, default to the
+        latest commit on the work tree's current branch if invoked in a work
+        tree, and to a commit resolved via the repository's HEAD reference
+        otherwise.
     The options for got tag are as
         follows:
     
+      -c
+        commit
+      Make the newly created tag reference point at the specified
+          commit. The expected
+          commit argument is a commit ID SHA1 hash or an
+          existing reference or tag name which will be resolved to a commit ID.
+          An abbreviated hash argument will be expanded to a full SHA1 hash
+          automatically, provided the abbreviation is unique.
       -m
         message
-      Use the specified tag message when creating the new tag Without the
+      
Use the specified tag message when creating the new tag. Without the
           -m option, got tag
           opens a temporary file in an editor where a tag message can be
           written.
@@ -927,6 +977,15 @@
       commit shared by the specified branch and the work
       tree's current branch, and stops once the tip commit of the specified
       branch has been rebased.
+    When got rebase is used as intended,
+        the specified branch contains changes made in
+        local commits that are not yet visible in any other repositories. The
+        work tree's current branch, which must be set with got
+        update -b before starting the rebase
+        operation, represents a branch from a remote repository which shares a
+        common history with the specified branch but has
+        at some point diverged due to commits added to the remote
+      repository.
     Rebased commits are accumulated on a temporary branch which
         the work tree will remain switched to throughout the entire rebase
         operation. Commits on this branch represent the same changes with the
@@ -997,7 +1056,7 @@
       
-a
       Abort an interrupted rebase operation. If this option is used, no
           other command-line arguments are allowed.
-      -c
+      -c
       Continue an interrupted rebase operation. If this option is used, no
           other command-line arguments are allowed.
     
@@ -1006,17 +1065,31 @@

Short alias for rebase.


   histedit
     [-a] [-c]
-    [-F histedit-script]
+    [-F histedit-script]
+    [-m]
   Edit commit history between the work tree's current base commit and the
       tip commit of the work tree's current branch.
+    Before starting a histedit operation
+        the work tree's current branch must be set with got
+        update -b to the branch which should be edited, unless this
+        branch is already the current branch of the work tree. The tip of this
+        branch represents the upper bound (inclusive) of commits touched by the
+        histedit operation.
+    Furthermore, the work tree's base commit must be set with
+        got update -c to a point in this branch's commit
+        history where editing should begin. This commit represents the lower
+        bound (non-inclusive) of commits touched by the
+        histedit operation.
     Editing of commit history is controlled via a
-        histedit script which can be edited interactively
-        or passed on the command line. The format of the histedit script is
-        line-based. Each line in the script begins with a command name, followed
-        by whitespace and an argument. For most commands, the expected argument
-        is a commit ID SHA1 hash. Any remaining text on the line is ignored.
-        Lines which begin with the ‘#’ character are ignored
-        entirely.
+        histedit script which can be written in an editor
+        based on a template, passed on the command line, or generated with the
+        -m option if only log messages need to be
+        edited.
+    The format of the histedit script is line-based. Each line in
+        the script begins with a command name, followed by whitespace and an
+        argument. For most commands, the expected argument is a commit ID SHA1
+        hash. Any remaining text on the line is ignored. Lines which begin with
+        the ‘#’ character are ignored entirely.
     The available commands are as follows:
     
@@ -1105,9 +1178,10 @@
         the edited history contains changes to files outside of the work tree's
         path prefix, the work tree cannot be used to edit the history of this
         branch.
-    The got update command will refuse to
-        run while a histedit operation is in progress. Other commands which
-        manipulate the work tree may be used, and the got
+    
The got update, got
+        rebase, and got integrate commands will
+        refuse to run while a histedit operation is in progress. Other commands
+        which manipulate the work tree may be used, and the got
         commit command may be used to commit arbitrary changes to the
         temporary branch while the histedit operation is interrupted.
The options for got histedit are as
@@ -1116,9 +1190,20 @@
       
-a
Abort an interrupted histedit operation. If this option is used, no
           other command-line arguments are allowed.

-      -c
+      -c
       Continue an interrupted histedit operation. If this option is used, no
           other command-line arguments are allowed.
+      -F
+        histedit-script
+      Use the specified histedit-script instead of
+          opening a temporary file in an editor where a histedit script can be
+          written.
+      -m
+      Edit log messages only. This option is a quick equivalent to a
+          histedit script which edits only log messages but otherwise leaves
+          every picked commit as-is. The -m option can
+          only be used when starting a new histedit operation. If this option is
+          used, no other command-line arguments are allowed.
     
   
   he
@@ -1232,7 +1317,7 @@
           individual patches derived from the modified file content can be
           staged. Files in added or deleted status may only be staged or
           rejected in their entirety.
-      -F
+      
-F
         response-script
       With the -p option, read “y”,
           “n”, and “q” responses line-by-line from
@@ -1302,7 +1387,7 @@
           If a file is staged in modified status, individual patches derived
           from the staged file content can be unstaged. Files staged in added or
           deleted status may only be unstaged in their entirety.
-      -F
+      
-F
         response-script
       With the -p option, read “y”,
           “n”, and “q” responses line-by-line from
@@ -1332,7 +1417,7 @@
     The options for got cat are as
         follows:
     
-      -c
+      
-c
         commit
       Look up paths in the specified commit. If this
           option is not used, paths are looked up in the commit resolved via the
@@ -1451,6 +1536,20 @@
     branch resolved via the repository's HEAD reference, respectively:
 
 $ got log -p -l 3
+In a work tree or a git repository directory, log the history of a
+    subdirectory:
+
+$ got log sys/uvm
+While operating inside a work tree, paths are specified relative
+    to the current working directory, so this command will log the subdirectory
+    sys/uvm:
+
+$ cd sys/uvm && got log
+  '.'
+And this command has the same effect:
+
+$ cd sys/dev/usb && got log
+  ../../uvm
 Add new files and remove obsolete files in a work tree
   directory:
 
@@ -1545,6 +1644,13 @@
 $ got update -b
   origin/master
 $ got rebase master
+On the “master” branch, log messages for local
+    changes can now be amended with “OK” by other developers and
+    any other important new information:
+
+$ got update -c
+  origin/master
+$ got histedit -m
 Local changes on the “master” branch can then be
     pushed to the remote repository with git push:
 
@@ -1598,7 +1704,7 @@
 
 
       
     
       

-    
+    
   February 18, 2020 February 25, 2020
     OpenBSD 6.6
   
 

blob - d14ad9cb4effa9916d43ab163beb43c0e35a65fa
blob + af1ea58f1cbde8d51246d35408146258221a1e1e
--- gotweb.8.html
+++ gotweb.8.html
@@ -156,7 +156,7 @@
 
 
-    
+    
   February 18, 2020 February 25, 2020
     OpenBSD 6.6
   
 
blob - c1c37d1c8fafa7fdc565f863195a38e59e369e9b
blob + 9b666b3705c06b13d7e8f78088e5b2b944c3af1e
--- tog.1.html
+++ tog.1.html
@@ -102,7 +102,11 @@
     commit] [-r
     repository-path] [path]
   
Display history of a repository. If a path is
-      specified, show only commits which modified this path.
+      specified, show only commits which modified this path. If invoked in a
+      work tree, the path is interpreted relative to the
+      current working directory, and the work tree's path prefix is implicitly
+      prepended. Otherwise, the path is interpreted relative to the repository
+      root.
     This command is also executed if no explicit command is
         specified.
     The key bindings for tog log are as
@@ -173,19 +177,19 @@
       
-r
         repository-path

       Use the repository at the specified path. If not specified, assume the
-          repository is located at or above the current working directory.
+          repository is located at or above the current working directory. If
+          this directory is a got(1) work tree, use the
+          repository path associated with this work tree.
     
   
   diff
-    [repository-path] object1
-    object2
+    [-r repository-path]
+    object1 object2
   Display the differences between two objects in the repository. Each
       object argument is an object ID SHA1 hash. An
       abbreviated hash argument will be expanded to a full SHA1 hash
       automatically, provided the abbreviation is unique. Both objects must be
-      of the same type (blobs, trees, or commits). If the
-      repository path is omitted, use the current working
-      directory.
+      of the same type (blobs, trees, or commits).
     The key bindings for tog diff are as
         follows:
     
@@ -222,6 +226,16 @@
       N
       Find the previous line which matches the current search pattern.
     
+    The options for tog diff are as
+        follows:
+    
+      -r
+        repository-path
+      Use the repository at the specified path. If not specified, assume the
+          repository is located at or above the current working directory. If
+          this directory is a got(1) work tree, use the
+          repository path associated with this work tree.
+    
   
   blame
     [-c commit]
@@ -231,12 +245,18 @@
     The key bindings for tog blame are as
         follows:
     
-      Down-arrow,
-        j, Page-down, Space
+      Down-arrow,
+        j
       Move the selection cursor down.
-      Up-arrow,
-        k, Page-up
+      Up-arrow,
+        k
       Move the selection cursor up.
+      Page-down,
+        Space, Ctrl+f
+      Move the selection cursor down one page.
+      Page-up,
+        Ctrl+b
+      Move the selection cursor up one page.
       Enter
       Open a diff view for the currently selected
           line's commit.
@@ -269,16 +289,20 @@
           branch or a commit ID SHA1 hash. An abbreviated hash argument will be
           expanded to a full SHA1 hash automatically, provided the abbreviation
           is unique.
-      -r
+      
-r
         repository-path
       Use the repository at the specified path. If not specified, assume the
-          repository is located at or above the current working directory.
+          repository is located at or above the current working directory. If
+          this directory is a got(1) work tree, use the
+          repository path associated with this work tree.
     
   
   
tree
     [-c commit]
-    [-r repository-path]
-  Display the repository tree.
+    [-r repository-path]
+    [path]
+  
Display the repository tree. If a path is specified,
+      show tree entries at this path.
     Displayed tree entries may carry one of the following trailing
         annotations:
     
@@ -302,12 +326,18 @@
     The key bindings for tog tree are as
         follows:

-      Down-arrow,
-        j, Page-down
+      Down-arrow,
+        j
       Move the selection cursor down.
-      Up-arrow,
-        k, Page-up
+      Up-arrow,
+        k
       Move the selection cursor up.
+      Page-down,
+        Ctrl+f
+      Move the selection cursor down one page.
+      Page-up,
+        Ctrl+b
+      Move the selection cursor up one page.
       Enter
       Enter the currently selected directory, or switch to the
           blame view for the currently selected
@@ -342,7 +372,7 @@
           branch or a commit ID SHA1 hash. An abbreviated hash argument will be
           expanded to a full SHA1 hash automatically, provided the abbreviation
           is unique.
-      -r
+      
-r
         repository-path
       Use the repository at the specified path. If not specified, assume the
           repository is located at or above the current working directory. If
@@ -421,7 +451,7 @@
 
 

     
-    
+    
   February 18, 2020 February 25, 2020
     OpenBSD 6.6