diff options
Diffstat (limited to 'fritteli.txt')
-rw-r--r-- | fritteli.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fritteli.txt b/fritteli.txt index a2f2700ae02f..d106204d624f 100644 --- a/fritteli.txt +++ b/fritteli.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/fritteli/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync fritteli +*** syncing fritteli 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: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing fritteli *** synced fritteli * Sync succeeded $ git log --format=%ci -1 |