diff options
Diffstat (limited to 'luman.txt')
| -rw-r--r-- | luman.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/luman.txt b/luman.txt index d39d5bafc4f8..6b3336a350c9 100644 --- a/luman.txt +++ b/luman.txt @@ -13,6 +13,19 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/luman.git'}], 'status': 'unofficial'} $ pmaint sync luman +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 luman *** synced luman |