From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 25 Feb 2020 19:18:32 +0000 (-0800)
Subject: Merge branch 'bw/remote-rename-update-config'
X-Git-Tag: v2.26.0-rc0~32
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=d0038f4b31d6ab1f0602a4d3c19e35c5004175fa

Merge branch 'bw/remote-rename-update-config'

"git remote rename X Y" needs to adjust configuration variables
(e.g. branch.<name>.remote) whose value used to be X to Y.
branch.<name>.pushRemote is now also updated.

* bw/remote-rename-update-config:
  remote rename/remove: gently handle remote.pushDefault config
  config: provide access to the current line number
  remote rename/remove: handle branch.<name>.pushRemote config values
  remote: clean-up config callback
  remote: clean-up by returning early to avoid one indentation
  pull --rebase/remote rename: document and honor single-letter abbreviations rebase types
---

d0038f4b31d6ab1f0602a4d3c19e35c5004175fa