remote: fix branch push_name setup

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
push: always use publish branch

Regardless of push.default, and remote.push.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
t5516 (fetch-push): fix test restoration

We shouldn't modify the commits; it screws the following tests.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
t5516 (fetch-push): add publish branch tests

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
branch: cleanups from upstream

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Synch with upstream

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
config: add branch.<name>.push doc

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
push: remove unnecessary cleanup

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
config: fix documentation merge issue

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
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