projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4d25d27 41f53fa)
Merge branch 'fc/fixes' into integration
authorFelipe Contreras <felipe.contreras@gmail.com>
Wed, 18 May 2016 21:03:46 +0000 (16:03 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Wed, 18 May 2016 21:03:46 +0000 (16:03 -0500)
commit5e28fe35972f61d510cddef7b2939badbfddd0ce
tree09f312a811c2515b97a874ab5793a2a9acb96604tree | snapshot
parent4d25d27e702b82dc0c66bce396703376b399a905commit | diff
parent41f53fadc69afc16a9c887bcf7b01ef5fe102de5commit | diff
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 diff1 | diff2 | blob | history
cache.h diff1 | diff2 | blob | history
config.c diff1 | diff2 | blob | history
remote.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.