File "/build/datalad-0.12.7/.pybuild/cpython3_3.8_datalad/build/datalad/support/gitrepo.py", line 2209, in _call_gitpy_with_progress    ret = callable(**git_kwargs)  File "/usr/lib/python3/dist-packages/git/remote.py", line 814, in pull    res = self._get_fetch_info_from_stderr(proc, progress)  File "/usr/lib/python3/dist-packages/git/remote.py", line 710, in _get_fetch_info_from_stderr    output.extend(FetchInfo._from_line(self.repo, err_line, fetch_line)  File "/usr/lib/python3/dist-packages/git/remote.py", line 710, in <genexpr>    output.extend(FetchInfo._from_line(self.repo, err_line, fetch_line)  File "/usr/lib/python3/dist-packages/git/remote.py", line 294, in _from_line    raise ValueError("Failed to parse line: %r" % line)ValueError: Failed to parse line: '  git config pull.rebase false  # merge (the default strategy)'

pull: warn if the user didn't say whether to rebase or to mergeOften novice Git users forget to say "pull --rebase" and end up with anunnecessary merge from upstream. What they usually want is either "pull--rebase" in the simpler cases, or "pull --ff-only" to update the copyof main integration branches, and rebase their work separately. Thepull.rebase configuration variable exists to help them in the simplercases, but there is no mechanism to make these users aware of it.Issue a warning message when no --[no-]rebase option from the commandline and no pull.rebase configuration variable is given. This willinconvenience those who never want to "pull --rebase", who haven't hadto do anything special, but the cost of the inconvenience is paid onlyonce per user, which should be a reasonable cost to help a number of newusers.Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>Signed-off-by: Junio C Hamano <gitster@pobox.com>