1 files changed, 14 insertions, 2 deletions
diff --git a/ros-overlay.txt b/ros-overlay.txt
index 38d1c1fef595..44476729c07b 100644
--- a/ros-overlay.txt
+++ b/ros-overlay.txt
@@ -7,8 +7,20 @@
  'source': [{'type': 'git', 'uri': 'git://github.com/ros/ros-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync ros-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/ros-overlay'...
-Updating files:  56% (13333/23444)
-Updating files:  57% (13364/23444)
-Updating files:  58% (13598/23444)
-Updating files:  59% (13832/23444)
-Updating files:  60% (14067/23444)
-Updating files:  61% (14301/23444)
-Updating files:  62% (14536/23444)
-Updating files:  63% (14770/23444)
-Updating files:  64% (15005/23444)
-Updating files:  65% (15239/23444)
-Updating files:  66% (15474/23444)
-Updating files:  67% (15708/23444)
-Updating files:  68% (15942/23444)
-Updating files:  69% (16177/23444)
-Updating files:  70% (16411/23444)
-Updating files:  71% (16646/23444)
-Updating files:  72% (16880/23444)
-Updating files:  73% (17115/23444)
-Updating files:  74% (17349/23444)
-Updating files:  75% (17583/23444)
-Updating files:  76% (17818/23444)
-Updating files:  77% (18052/23444)
-Updating files:  78% (18287/23444)
-Updating files:  79% (18521/23444)
-Updating files:  80% (18756/23444)
-Updating files:  81% (18990/23444)
-Updating files:  82% (19225/23444)
-Updating files:  83% (19459/23444)
-Updating files:  84% (19693/23444)
-Updating files:  85% (19928/23444)
-Updating files:  86% (20162/23444)
-Updating files:  87% (20397/23444)
-Updating files:  88% (20631/23444)
-Updating files:  89% (20866/23444)
-Updating files:  90% (21100/23444)
-Updating files:  91% (21335/23444)
-Updating files:  92% (21569/23444)
-Updating files:  93% (21803/23444)
-Updating files:  94% (22038/23444)
-Updating files:  95% (22272/23444)
-Updating files:  96% (22507/23444)
-Updating files:  97% (22741/23444)
-Updating files:  98% (22976/23444)
-Updating files:  99% (23210/23444)
-Updating files: 100% (23444/23444)
-Updating files: 100% (23444/23444), done.
+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:
+
+  git config pull.rebase false  # merge (the default strategy)
+  git config pull.rebase true   # rebase
+  git config pull.ff only       # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
 *** syncing ros-overlay
 *** synced ros-overlay
  * Sync succeeded