From 4ef5b705c32d26cf3d113554782d8699dd0f0c15 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 4 May 2021 06:34:54 +0000 Subject: 2021-05-04T06:30:01Z --- jamesbroadhead.html | 40 +++++++--------------------------------- 1 file changed, 7 insertions(+), 33 deletions(-) (limited to 'jamesbroadhead.html') diff --git a/jamesbroadhead.html b/jamesbroadhead.html index 1df4440589f1..7ea52c058176 100644 --- a/jamesbroadhead.html +++ b/jamesbroadhead.html @@ -50,45 +50,19 @@ 20
*** syncing jamesbroadhead
- 21
warning: Pulling without specifying how to reconcile divergent branches is
+            21
Already up to date.
 

-            22
discouraged. You can squelch this message by running one of the following
+            22
*** synced jamesbroadhead
 

-            23
commands sometime before your next pull:
+            23
 * Sync succeeded
 

-            24
+            24
$ git log --format=%ci -1
 

-            25
  git config pull.rebase false  # merge (the default strategy)
+            25
$ git show -q --pretty=format:%G? HEAD
 

-            26
  git config pull.rebase true   # rebase
+            26
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jamesbroadhead
 

-            27
  git config pull.ff only       # fast-forward only
-

-            28
-

-            29
You can replace "git config" with "git config --global" to set a default
-

-            30
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            31
or --ff-only on the command line to override the configured default per
-

-            32
invocation.
-

-            33
-

-            34
Already up to date.
-

-            35
*** synced jamesbroadhead
-

-            36
 * Sync succeeded
-

-            37
$ git log --format=%ci -1
-

-            38
$ git show -q --pretty=format:%G? HEAD
-

-            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jamesbroadhead
-

-            40
 * Cache regenerated successfully
+            27
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad