diff options
Diffstat (limited to 'cj-overlay.txt')
| -rw-r--r-- | cj-overlay.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/cj-overlay.txt b/cj-overlay.txt index 267508676bc2..f2cfadbd6d94 100644 --- a/cj-overlay.txt +++ b/cj-overlay.txt @@ -7,6 +7,19 @@ 'source': [{'type': 'git', 'uri': 'git://github.com/junghans/cj-overlay'}], 'status': 'official'} $ pmaint sync cj-overlay +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 cj-overlay *** synced cj-overlay |