Skip to content

git config issues #80

Open
Open
@rgetz

Description

@rgetz

When doing something like:

analog@phaser:/usr/local/src/libiio $ sudo git checkout master
Previous HEAD position was fb64aca examples/cmake: Fix iio-monitor dependency checks
Switched to branch 'master'
Your branch is behind 'origin/master' by 58 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
analog@phaser:/usr/local/src/libiio $ sudo git pull
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint: 
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint: 
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
Updating 21b466d..dda3a8b
...

doing a simple (once as root, once as a normal user):

analog@phaser:/usr/local/src/libiio $ sudo git config --global pull.rebase false
analog@phaser:/usr/local/src/libiio $ git config --global pull.rebase false

will get rid of the annoying message.

-Robin

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions