diff options
Diffstat (limited to 'roslin.txt')
| -rw-r--r-- | roslin.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/roslin.txt b/roslin.txt index eaa2d2698b6f..cd5a8a2d86d2 100644 --- a/roslin.txt +++ b/roslin.txt @@ -12,6 +12,19 @@ 'uri': 'https://gitlab.com/roslin-uberlay/roslin.git'}], 'status': 'unofficial'} $ pmaint sync roslin +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 roslin *** synced roslin |