Merge branch 'fc/fixes' into integration
authorFelipe Contreras <felipe.contreras@gmail.com>
Wed, 18 May 2016 18:41:45 +0000 (13:41 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Wed, 18 May 2016 18:41:45 +0000 (13:41 -0500)
commit3677000a1b430920f2c91cf69132a31852181fa6
treef77fd6c4bac953fe5c1cbde61a234703963f0725
parentc50f907481beb7709a9652c867685ca4c621974f
parent174578827dd3230bb4769df24d00c07d803a125e
Merge branch 'fc/fixes' into integration

* fc/fixes:
  credential: fix wrong double password prompt
  rebase: disable fork-point by default
  Silence gcc warnings with -O3
  Revert "silence some -Wuninitialized false positives"
  Revert "make error()'s constant return value more visible"
  version-gen: fix versions
  version-gen: cleanup
  build: fix installation of scripts

# Conflicts:
# Makefile
Makefile
cache.h
config.c
remote.c