diff options
Diffstat (limited to 'quarks.txt')
| -rw-r--r-- | quarks.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/quarks.txt b/quarks.txt index 0607b4823ac8..8fe3f394d77d 100644 --- a/quarks.txt +++ b/quarks.txt @@ -10,6 +10,7 @@ 'uri': 'https://git.zero-downtime.net/quark/quarks.git'}], 'status': 'unofficial'} $ pmaint sync quarks +*** syncing quarks 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: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing quarks *** synced quarks * Sync succeeded $ git log --format=%ci -1 |