Merge branch 'fc/publish' into integration
authorFelipe Contreras <felipe.contreras@gmail.com>
Wed, 18 May 2016 21:03:45 +0000 (16:03 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Wed, 18 May 2016 21:03:45 +0000 (16:03 -0500)
commit061045059b6c3b9a71a025ce8649f8dacbfae051
tree353f3ed28dcb74075d5f7e62ffb767d25461cf03
parentc9120c2f448ef27e3261efb56ffbda9ed1999982
parentdc0abd9ae7a5f1bc6db1c5bb7b10099bc50ddb4f
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