Merge branch 'fc/master' into travis-ci felipec/travis-ci
authorFelipe Contreras <felipe.contreras@gmail.com>
Fri, 11 Apr 2014 18:16:43 +0000 (13:16 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Fri, 11 Apr 2014 18:16:43 +0000 (13:16 -0500)
commit97caa39f82189d4bf37e7150d3919b031bb9659a
tree03ffcf5a3cd9c5a46f485ac1a0c39648f84441d0
parentddd3a729efb1023c4d50b36ff0ed88a2f26aeeca
parentc73078e16655bbd220310590f61d413e1a6a0fc9
Merge branch 'fc/master' into travis-ci

* fc/master:
  config: fix documentation merge issue
  push: remove unnecessary cleanup
  config: add branch.<name>.push doc
  Synch with upstream
  branch: cleanups from upstream
  t5516 (fetch-push): add publish branch tests
  t5516 (fetch-push): fix test restoration
  push: always use publish branch
  remote: fix branch push_name setup