diff options
Diffstat (limited to 'octopus.txt')
| -rw-r--r-- | octopus.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/octopus.txt b/octopus.txt index a11660b2747b..52007373bf5e 100644 --- a/octopus.txt +++ b/octopus.txt @@ -7,6 +7,19 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/Bfgeshka/octopus.git'}], 'status': 'unofficial'} $ pmaint sync octopus +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 octopus *** synced octopus |