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. From github.com:liballeg/allegro5 * branch master -> FETCH_HEAD d743a352a..e8457df94 master -> origin/master Updating d743a352a..e8457df94 Fast-forward examples/CMakeLists.txt | 7 +- examples/data/ex_shader_palette_pixel.glsl | 23 ++++++ examples/ex_palette.c | 125 ++++++++++++----------------- 3 files changed, 80 insertions(+), 75 deletions(-) create mode 100644 examples/data/ex_shader_palette_pixel.glsl