From fabbc5db948f14dba7b5f2374a7011755f8707ae Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Thu, 1 Oct 2020 14:35:07 +0000 Subject: 2020-10-01T14:30:01Z --- emacs.html | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'emacs.html') diff --git a/emacs.html b/emacs.html index 54e196188b25..509b52af368b 100644 --- a/emacs.html +++ b/emacs.html @@ -48,49 +48,47 @@ 19
$ pmaint sync emacs
- 20
WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
warning: Pulling without specifying how to reconcile divergent branches is
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
discouraged. You can squelch this message by running one of the following
+            22
commands sometime before your next pull:
 

-            23
commands sometime before your next pull:
+            23
 

-            24
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
  git config pull.rebase false  # merge (the default strategy)
+            25
  git config pull.rebase true   # rebase
 

-            26
  git config pull.rebase true   # rebase
+            26
  git config pull.ff only       # fast-forward only
 

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

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

-            29
You can replace "git config" with "git config --global" to set a default
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
preference for all repositories. You can also pass --rebase, --no-rebase,
+            30
or --ff-only on the command line to override the configured default per
 

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

-            32
invocation.
+            32
 

-            33
+            33
Already up to date.
 

-            34
Already up to date.
+            34
*** syncing emacs
 

-            35
*** syncing emacs
+            35
*** synced emacs
 

-            36
*** synced emacs
+            36
 * Sync succeeded
 

-            37
 * Sync succeeded
+            37
$ git log --format=%ci -1
 

-            38
$ git log --format=%ci -1
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
$ git show -q --pretty=format:%G? HEAD
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 emacs
 

-            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 emacs
-

-            41
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad