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