diff options
Diffstat (limited to 'tante.txt')
| -rw-r--r-- | tante.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tante.txt b/tante.txt index 21cd904b1bb5..8ecdd365d68c 100644 --- a/tante.txt +++ b/tante.txt @@ -7,6 +7,7 @@ 'status': 'unofficial'} $ pmaint sync tante WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing tante 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 tante *** synced tante * Sync succeeded $ git log --format=%ci -1 |