branch.reflog -> reflog

unison-cli/src/Unison/CommandLine/InputPatterns.hs

@@ -2270,13 +2270,13 @@ deprecatedViewRootReflog =
 branchReflog :: InputPattern
 branchReflog =
   InputPattern
-    "branch.reflog"
-    ["reflog.branch", "reflog"]
+    "reflog"
+    ["reflog.branch", "branch.reflog"]
     I.Visible
     []
     ( P.lines
-        [ "`branch.reflog` lists all the changes that have affected the current branch.",
-          "`branch.reflog /mybranch` lists all the changes that have affected /mybranch."
+        [ "`reflog` lists all the changes that have affected the current branch.",
+          "`reflog /mybranch` lists all the changes that have affected /mybranch."
         ]
     )
     ( \case

unison-src/transcripts/alias-many.output.md

@@ -39,8 +39,8 @@ scratch/main> alias.many List.adjacentPairs List.all List.any List.chunk List.ch
     14. List.tail          : [a] -> Optional [a]
     15. List.takeWhile     : (a ->{𝕖} Boolean) -> [a] ->{𝕖} [a]
   
-  Tip: You can use `undo` or use a hash from `branch.reflog` to
-       undo this change.
+  Tip: You can use `undo` or use a hash from `reflog` to undo
+       this change.
 
 scratch/main> find-in mylib
 

unison-src/transcripts/debug-name-diffs.output.md

@@ -45,8 +45,8 @@ scratch/main> delete.term.verbose a.b.one
   
     1. a.b.one : ##Nat
   
-  Tip: You can use `undo` or use a hash from `branch.reflog` to
-       undo this change.
+  Tip: You can use `undo` or use a hash from `reflog` to undo
+       this change.
 
 scratch/main> alias.term a.two a.newtwo
 

unison-src/transcripts/delete.output.md

@@ -36,26 +36,26 @@ scratch/main> delete.verbose foo
   
     1. foo : Nat
   
-  Tip: You can use `undo` or use a hash from `branch.reflog` to
-       undo this change.
+  Tip: You can use `undo` or use a hash from `reflog` to undo
+       this change.
 
 scratch/main> delete.verbose Foo
 
   Removed definitions:
   
     1. structural type Foo
   
-  Tip: You can use `undo` or use a hash from `branch.reflog` to
-       undo this change.
+  Tip: You can use `undo` or use a hash from `reflog` to undo
+       this change.
 
 scratch/main> delete.verbose Foo.Foo
 
   Removed definitions:
   
     1. Foo.Foo : '#089vmor9c5
   
-  Tip: You can use `undo` or use a hash from `branch.reflog` to
-       undo this change.
+  Tip: You can use `undo` or use a hash from `reflog` to undo
+       this change.
 
 ```
 How about an ambiguous term?
@@ -93,8 +93,8 @@ scratch/main> delete.verbose a.foo
     2. a.bar            ┐  3. a.foo#dcgdua2lj6 (removed)
     4. a.foo#dcgdua2lj6 ┘  
   
-  Tip: You can use `undo` or use a hash from `branch.reflog` to
-       undo this change.
+  Tip: You can use `undo` or use a hash from `reflog` to undo
+       this change.
 
 scratch/main> ls a
 
@@ -134,17 +134,17 @@ scratch/main> delete.verbose a.Foo
     4. lib.builtins.Unit │  
     5. a.Foo#00nv2kob8f  ┘  
   
-  Tip: You can use `undo` or use a hash from `branch.reflog` to
-       undo this change.
+  Tip: You can use `undo` or use a hash from `reflog` to undo
+       this change.
 
 scratch/main> delete.verbose a.Foo.Foo
 
   Removed definitions:
   
     1. a.Foo.Foo : '#089vmor9c5
   
-  Tip: You can use `undo` or use a hash from `branch.reflog` to
-       undo this change.
+  Tip: You can use `undo` or use a hash from `reflog` to undo
+       this change.
 
 ```
 Finally, let's try to delete a term and a type with the same name.
@@ -169,8 +169,8 @@ scratch/main> delete.verbose foo
     1. structural type foo
     2. foo : Nat
   
-  Tip: You can use `undo` or use a hash from `branch.reflog` to
-       undo this change.
+  Tip: You can use `undo` or use a hash from `reflog` to undo
+       this change.
 
 ```
 We want to be able to delete multiple terms at once
@@ -198,8 +198,8 @@ scratch/main> delete.verbose a b c
     2. b : Text
     3. c : Text
   
-  Tip: You can use `undo` or use a hash from `branch.reflog` to
-       undo this change.
+  Tip: You can use `undo` or use a hash from `reflog` to undo
+       this change.
 
 ```
 We can delete terms and types in the same invocation of delete
@@ -230,8 +230,8 @@ scratch/main> delete.verbose a b c Foo
     3. b : Text
     4. c : Text
   
-  Tip: You can use `undo` or use a hash from `branch.reflog` to
-       undo this change.
+  Tip: You can use `undo` or use a hash from `reflog` to undo
+       this change.
 
 scratch/main> delete.verbose Foo.Foo
 
@@ -241,8 +241,8 @@ scratch/main> delete.verbose Foo.Foo
     1. Foo.Foo ┐  2. Foo.Foo (removed)
     3. foo.Foo ┘  
   
-  Tip: You can use `undo` or use a hash from `branch.reflog` to
-       undo this change.
+  Tip: You can use `undo` or use a hash from `reflog` to undo
+       this change.
 
 ```
 We can delete a type and its constructors
@@ -270,8 +270,8 @@ scratch/main> delete.verbose Foo Foo.Foo
     2. Foo.Foo ┐  3. Foo.Foo (removed)
     4. foo.Foo ┘  
   
-  Tip: You can use `undo` or use a hash from `branch.reflog` to
-       undo this change.
+  Tip: You can use `undo` or use a hash from `reflog` to undo
+       this change.
 
 ```
 You should not be able to delete terms which are referenced by other terms
@@ -335,8 +335,8 @@ scratch/main> delete.verbose e f g h
     3. g : Nat
     4. h : Nat
   
-  Tip: You can use `undo` or use a hash from `branch.reflog` to
-       undo this change.
+  Tip: You can use `undo` or use a hash from `reflog` to undo
+       this change.
 
 ```
 You should be able to delete a type and all the functions that reference it in a single command
@@ -365,8 +365,8 @@ scratch/main> delete.verbose Foo Foo.Foo incrementFoo
     2. Foo.Foo      : Nat -> Foo
     3. incrementFoo : Foo -> Nat
   
-  Tip: You can use `undo` or use a hash from `branch.reflog` to
-       undo this change.
+  Tip: You can use `undo` or use a hash from `reflog` to undo
+       this change.
 
 ```
 If you mess up on one of the names of your command, delete short circuits
@@ -417,8 +417,8 @@ scratch/main> delete.verbose ping
   
     1. ping : 'Nat
   
-  Tip: You can use `undo` or use a hash from `branch.reflog` to
-       undo this change.
+  Tip: You can use `undo` or use a hash from `reflog` to undo
+       this change.
 
 scratch/main> view pong
 

unison-src/transcripts/diff-namespace.output.md

@@ -268,8 +268,8 @@ scratch/ns2> delete.term.verbose fromJust'
     1. fromJust' ┐  2. fromJust' (removed)
     3. yoohoo    ┘  
   
-  Tip: You can use `undo` or use a hash from `branch.reflog` to
-       undo this change.
+  Tip: You can use `undo` or use a hash from `reflog` to undo
+       this change.
 
 scratch/main> diff.namespace /ns3: /ns2:
 

unison-src/transcripts/help.output.md

@@ -44,10 +44,6 @@ scratch/main> help
   branch.empty (or branch.create-empty, create.empty-branch)
   Create a new empty branch.
   
-  branch.reflog (or reflog.branch, reflog)
-  `branch.reflog` lists all the changes that have affected the current branch.
-  `branch.reflog /mybranch` lists all the changes that have affected /mybranch.
-  
   branch.rename (or rename.branch)
   `branch.rename foo`  renames the current branch to `foo`
   
@@ -181,7 +177,7 @@ scratch/main> help
                             PATH.
   
   deprecated.root-reflog
-  `deprecated.root-reflog` lists the changes that have affected the root namespace. This has been deprecated in favor of `branch.reflog` which shows the reflog for the current project.
+  `deprecated.root-reflog` lists the changes that have affected the root namespace. This has been deprecated in favor of `reflog` which shows the reflog for the current project.
   
   diff.namespace
   `diff.namespace before after` shows how the namespace `after`
@@ -675,6 +671,10 @@ scratch/main> help
   quit (or exit, :q)
   Exits the Unison command line interface.
   
+  reflog (or reflog.branch, branch.reflog)
+  `reflog` lists all the changes that have affected the current branch.
+  `reflog /mybranch` lists all the changes that have affected /mybranch.
+  
   reflog.global
   `reflog.global` lists all recent changes across all projects and branches.
   
@@ -690,7 +690,7 @@ scratch/main> help
                               current project to the causal
                               `#pvfd222s8n`.
   
-  If you make a mistake using reset, consult the `branch.reflog`
+  If you make a mistake using reset, consult the `reflog`
   command and use another `reset` command to return to a
   previous state.
   

unison-src/transcripts/move-namespace.output.md

@@ -358,8 +358,8 @@ scratch/existing> move.namespace a b
   
   A branch existed at the destination: b so I over-wrote it.
   
-  Tip: You can use `undo` or use a hash from `branch.reflog` to
-       undo this change.
+  Tip: You can use `undo` or use a hash from `reflog` to undo
+       this change.
 
   Done.