[PATCH 0/2] Branch --set-upstream

This adds new switch --set-upstream that can set upstream information on existing branch branch without changing where the branch points to.

push --set-upstream doesn't help if user doesn't have push priviledges or if user is not up to date with upstream. Forcing branch recreate is not possible if user has own patches appiled to the branch.

This series is edited version of Matthieu Moy's branch --track patch series. The first patch is edited, the second is resent as-is.

Ilari Liusvaara (1):
  Add branch --set-upstream

Matthieu Moy (1):
  branch: warn and refuse to set a branch as a tracking branch of
    itself.

 Documentation/git-branch.txt |    8 ++++++-
 branch.c                     |   45 ++++++++++++++++++++++++++++++-----------
 builtin-branch.c             |    2 +
 cache.h                      |    1 +
 t/t6040-tracking-info.sh     |   21 +++++++++++++++++++
 5 files changed, 64 insertions(+), 13 deletions(-)