[PATCH v2 0/3] Support `git pull --rebase=interactive`

[Johannes Schindelin <johannes.schindelin@gmx.de>]

A couple of years ago, I found the need to collaborate on topic branches
that were rebased all the time, and I really needed to see what I was
rebasing when pulling, so I introduced an interactively-rebasing pull.

This patch series ports that work to the builtin pull.

Apart from the change outlined in the interdiff, the first two commit
messages changed, too.

Johannes Schindelin (3):
  pull: allow interactive rebase with --rebase=interactive
  remote: handle the config setting branch.*.rebase=interactive
  completion: add missing branch.*.rebase values

 Documentation/config.txt               |  1 +
 Documentation/git-pull.txt             |  4 +++-
 builtin/pull.c                         |  7 ++++++-
 builtin/remote.c                       | 10 +++++++---
 contrib/completion/git-completion.bash |  2 +-
 t/t5520-pull.sh                        | 10 ++++++++++
 6 files changed, 28 insertions(+), 6 deletions(-)

Interdiff vs v1:

 diff --git a/builtin/remote.c b/builtin/remote.c
 index 0af8300..2b2ff9b 100644
 --- a/builtin/remote.c
 +++ b/builtin/remote.c
 @@ -311,7 +311,7 @@ static int config_read_branches(const char *key, const char *value, void *cb)
  			if (v >= 0)
  				info->rebase = v;
  			else if (!strcmp(value, "preserve"))
 -				info->rebase = 1;
 +				info->rebase = NORMAL_REBASE;
  			else if (!strcmp(value, "interactive"))
  				info->rebase = INTERACTIVE_REBASE;
  		}

-- 
2.6.3.windows.1.300.g1c25e49