diff options
Diffstat (limited to 'ext-devlibs.txt')
| -rw-r--r-- | ext-devlibs.txt | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/ext-devlibs.txt b/ext-devlibs.txt index 83fc23187197..98c84e441b1e 100644 --- a/ext-devlibs.txt +++ b/ext-devlibs.txt @@ -15,19 +15,6 @@ pkgcore 0.11.2 -- extended version info unavailable $ pmaint sync ext-devlibs *** syncing ext-devlibs -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. *** synced ext-devlibs * Sync succeeded |