Merge branch 'fc/publish' into integration
authorFelipe Contreras <felipe.contreras@gmail.com>
Wed, 18 May 2016 18:41:44 +0000 (13:41 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Wed, 18 May 2016 18:41:44 +0000 (13:41 -0500)
commit6482db33e7c9249ce614ac26a1832e66f5fe877a
tree6aafa837630299e098384de9a5d9958d88b16f95
parent37eaa0281512f5628b31ccdbbd7877ad96c5db15
parent38a5f97e47db32b2e3cdf5ed00540472ac1a35e0
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