Merge branch 'fc/fixes' into integration
authorFelipe Contreras <felipe.contreras@gmail.com>
Wed, 18 May 2016 16:55:03 +0000 (11:55 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Wed, 18 May 2016 16:55:03 +0000 (11:55 -0500)
commite58403017e64563cbf0a2fd97fce62a24cf6f5ae
treea1686dd3ea65d0c218156996a384fa3066ca1c5b
parent60bab4989cdc224dca8bdfe9feb935517d2a5183
parenta2f6e5eaa84d1601208170c8e178fb4739f83c22
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