diff options
Diffstat (limited to 'wayland-desktop.txt')
| -rw-r--r-- | wayland-desktop.txt | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/wayland-desktop.txt b/wayland-desktop.txt index 8d8f3d19939c..cc16f9346195 100644 --- a/wayland-desktop.txt +++ b/wayland-desktop.txt @@ -10,9 +10,26 @@ {'type': 'git', 'uri': 'git+ssh://git@github.com/bsd-ac/wayland-desktop.git'}], 'status': 'unofficial'} - * Resetting, sync parameters changed $ pmaint sync wayland-desktop -Cloning into '/var/lib/repo-mirror-ci/sync/wayland-desktop'... +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. + +From https://github.com/bsd-ac/wayland-desktop + e00f5d4..bf454b0 master -> origin/master +Updating e00f5d4..bf454b0 +Fast-forward + README.md | 1 + + 1 file changed, 1 insertion(+) *** syncing wayland-desktop *** synced wayland-desktop * Sync succeeded |