Merge branch 'fc/publish' 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)
commitfe410786352036fc711e86d1e298692ba3d8ec25
treed47396464586ce88674b9394b80a21cc2a57f357
parent8aaa7892636bb019686116b60266294a496c52c5
parentd8740a3cbf61e36ae819cd308e21ccdef60cd3d1
Merge branch 'fc/publish' into integration

* fc/publish:
  remote: show published status and help
  branch: add quick marker to see published status
  sha1_name: add support for @{publish} marks
  sha1_name: simplify track finding
  branch: display publish branch
  push: add --set-publish option
  branch: add --set-publish-to option
  Add concept of 'publish' branch
  t5516 (fetch-push): fix test restoration
Documentation/config.txt
Documentation/git-branch.txt
builtin/branch.c
t/t6040-tracking-info.sh