diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-01-13 13:17:19 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-01-13 13:00:01 -0800 |
| commit | b5496d484d244bc291db0973466b76e7f679cb9f (patch) | |
| tree | bac8ae3915b6993b8600612fdf1f3ba5e5709731 /Documentation/git-merge-one-file.txt | |
| parent | pull: allow interactive rebase with --rebase=interactive (diff) | |
| download | tgif-b5496d484d244bc291db0973466b76e7f679cb9f.tar.xz | |
remote: handle the config setting branch.*.rebase=interactive
The config variable branch.<branchname>.rebase is not only used by `git
pull`, but also by `git remote` when showing details about a remote.
Therefore, it needs to be taught to accept the newly-introduced
`interactive` value of said variable.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions