diff options
Diffstat (limited to 'distros.txt')
| -rw-r--r-- | distros.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/distros.txt b/distros.txt index c9685d1e335a..d3c30c1eaae4 100644 --- a/distros.txt +++ b/distros.txt @@ -7,6 +7,7 @@ 'uri': 'git://git.calculate-linux.org/calculate/distros-overlay.git'}], 'status': 'unofficial'} $ pmaint sync distros +*** syncing distros 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: @@ -21,7 +22,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing distros *** synced distros * Sync succeeded $ git log --format=%ci -1 |