summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-05-07 07:19:53 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-05-07 07:19:53 +0000
commit78fc156b676a19eed58208d216d340fa0e8371d6 (patch)
treedded81229f066df11f46b774a45b3792e25ef0fc /ago.txt
parent2021-05-07T07:00:01Z (diff)
downloadrepos-78fc156b676a19eed58208d216d340fa0e8371d6.tar.gz
repos-78fc156b676a19eed58208d216d340fa0e8371d6.tar.bz2
repos-78fc156b676a19eed58208d216d340fa0e8371d6.zip
2021-05-07T07:15:01Z
Diffstat (limited to 'ago.txt')
-rw-r--r--ago.txt14
1 files changed, 14 insertions, 0 deletions
diff --git a/ago.txt b/ago.txt
index c350da2cecfb..afe5488cdee9 100644
--- a/ago.txt
+++ b/ago.txt
@@ -15,6 +15,20 @@ pkgcore 0.11.2 -- extended version info unavailable
$ pmaint sync ago
*** syncing ago
+From https://anongit.gentoo.org/git/dev/ago
+ + d97a69a...dbfe633 master -> origin/master (forced update)
+hint: Pulling without specifying how to reconcile divergent branches is
+hint: discouraged. You can squelch this message by running one of the following
+hint: commands sometime before your next pull:
+hint:
+hint: git config pull.rebase false # merge (the default strategy)
+hint: git config pull.rebase true # rebase
+hint: git config pull.ff only # fast-forward only
+hint:
+hint: You can replace "git config" with "git config --global" to set a default
+hint: preference for all repositories. You can also pass --rebase, --no-rebase,
+hint: or --ff-only on the command line to override the configured default per
+hint: invocation.
Already up to date.
*** synced ago
* Sync succeeded