diff options
Diffstat (limited to 'openclonk.txt')
-rw-r--r-- | openclonk.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/openclonk.txt b/openclonk.txt index 4966fd5b6c4e..27f964d2537d 100644 --- a/openclonk.txt +++ b/openclonk.txt @@ -12,6 +12,19 @@ 'uri': 'git+ssh://git@github.com/jcaesar/openclonk-overlay.git'}], 'status': 'unofficial'} $ pmaint sync openclonk +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 openclonk *** synced openclonk |