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