tree 2b67cde99b211b34335e838515690896794c6d75
parent 51ebf55b9309824346a6589c9f3b130c6f371b8f
parent b3fd6cbf29435f8b49a0a5d9f86236e00b084624
author Junio C Hamano <gitster@pobox.com> 1582658312 -0800
committer Junio C Hamano <gitster@pobox.com> 1582658312 -0800

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