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