summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-03-16 16:50:49 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-03-16 16:50:49 +0000
commitc8c0d9168e2b43c0a7362dac128e8af442229c9b (patch)
treeb5ac5481a92e2ceeabef18b1868fe6b2329d4d2f /octopus.txt
parent2021-03-16T16:30:01Z (diff)
downloadrepos-c8c0d9168e2b43c0a7362dac128e8af442229c9b.tar.gz
repos-c8c0d9168e2b43c0a7362dac128e8af442229c9b.tar.bz2
repos-c8c0d9168e2b43c0a7362dac128e8af442229c9b.zip
2021-03-16T16:45:01Z
Diffstat (limited to 'octopus.txt')
-rw-r--r--octopus.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/octopus.txt b/octopus.txt
index 17c6c286d36e..7e491558ede6 100644
--- a/octopus.txt
+++ b/octopus.txt
@@ -7,7 +7,6 @@
'source': [{'type': 'git', 'uri': 'https://github.com/Bfgeshka/octopus.git'}],
'status': 'unofficial'}
$ pmaint sync octopus
-*** syncing octopus
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:
@@ -22,6 +21,7 @@ or --ff-only on the command line to override the configured default per
invocation.
Already up to date.
+*** syncing octopus
*** synced octopus
* Sync succeeded
$ git log --format=%ci -1